From 480b11f604f2fee8c837e7cfc91bf21f9f72b019 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 31 Mar 2023 14:45:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8B=9C=E8=AE=BF=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/controller/api/BizCusVisitApi.java | 24 +++++++++++++++++++ .../serve/modules/biz/entity/BizCusVisit.java | 5 ++++ .../modules/biz/entity/bo/BizCusVisitBo.java | 3 +++ 3 files changed, 32 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java index 96a3ac61..9be92cdb 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java @@ -137,6 +137,30 @@ public class BizCusVisitApi { } private void saveOrUpdate(BizCusVisitBo param, String userId) { + BizCusVisit cusVisitDb= bizVisitService.getById(param.getId()); + if(cusVisitDb!=null){ + if(cusVisitDb.getStatus()==1){ + return; + }else if(cusVisitDb.getStatus()==0){ + param.setPhotos(null); + param.setLocalX(null); + param.setLocalY(null); + param.setAddressId(null); + param.setInputAddress(null); + param.setSignTypeId(null); + param.setCustomerId(null); + BizCusVisit cusVisit = BizCusVisit.toNewObject(param); + BmsSupplierVisitType visitType = bmsSupplierVisitTypeService.getById(cusVisitDb.getSignTypeId()); + if(visitType.getTypeFormId()!=null){ + BmsSupplierVisitForm visitForm = bmsSupplierVisitFormService.getById(visitType.getTypeFormId()); + cusVisit.setSignTypeFormId(visitForm.getId()); + cusVisit.setSignTypeForm(visitForm.getFormContext()); + } + cusVisit.setSignTypeFormValue(param.getFormJson()); + bizVisitService.updateById(cusVisit); + return; + } + } BizCusVisit cusVisit = BizCusVisit.toNewObject(param); SysUser sysUser = sysUserService.getById(userId); cusVisit.setVisitorId(userId); diff --git a/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java b/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java index 5ffa835f..fb834a62 100644 --- a/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java +++ b/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java @@ -56,6 +56,9 @@ public class BizCusVisit implements Serializable { /** 目标拜访的地址ID */ private String addressId; + /** 状态 */ + private Integer status; + /** 签到类型Id */ @NotNull(message = "签到类型不能为空") private Long signTypeId; @@ -65,7 +68,9 @@ public class BizCusVisit implements Serializable { private String signType; private String signTypeForm; + private Long signTypeFormId; + private String signTypeFormValue; /** 拜访人id */ diff --git a/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java b/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java index 38513427..12c0c349 100644 --- a/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java +++ b/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java @@ -49,6 +49,9 @@ public class BizCusVisitBo implements Serializable { /** 客户id */ private String customerId; + /** 状态 */ + private Integer status; + /** * 填写的表单内容 */