From 697ad11caeb383da604cff26af911b34df97d90c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 29 Apr 2022 13:50:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RentContractInfoServiceImpl.java | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java index 285ff8f..77117cd 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java @@ -163,7 +163,16 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl { + // 获取基本信息 + RentContractInfoDTO contractDto = get(dto.getId()); + + // 获取租客信息 + Map tenantParams = new HashMap<>(4); + tenantParams.put("contractId", contractDto.getId()); + List tenantList = rentTenantInfoService.list(tenantParams); + contractDto.setTenantList(tenantList); + + contractDto.getTenantList().forEach(tenant -> { RentTenantFormDTO formDTO = new RentTenantFormDTO(); List images = new ArrayList<>(); formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId()); @@ -171,6 +180,12 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl imgParams = new HashMap<>(4); + tenantParams.put("referenceId", tenant.getId()); + tenantParams.put("fileType", NumConstant.ZERO_STR); + List imgList = rentContractFileService.list(imgParams); + tenant.setImgList(imgList); + tenant.getImgList().forEach(img -> { // 更新基础库的人员头像 IcResiUserAttachmentDTO image = new IcResiUserAttachmentDTO(); @@ -183,24 +198,23 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl agencyInfo = govOrgOpenFeignClient.getAgencyById(dto.getCommunityId()); + user.setAgencyId(contractDto.getCommunityId()); + Result agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId()); user.setPids(agencyInfo.getData().getPids()); formDTO.setUser(user); epmetUserOpenFeignClient.updateImage(formDTO); - }); } } From 133b08cf3765841fa39bad21b0c6b1b73988bc7f Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 29 Apr 2022 15:10:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=B0=E5=8E=9F=E6=9D=A5=E7=9A=84dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/service/impl/RentContractInfoServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java index 77117cd..50b4749 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java @@ -170,9 +170,8 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl tenantParams = new HashMap<>(4); tenantParams.put("contractId", contractDto.getId()); List tenantList = rentTenantInfoService.list(tenantParams); - contractDto.setTenantList(tenantList); - contractDto.getTenantList().forEach(tenant -> { + tenantList.forEach(tenant -> { RentTenantFormDTO formDTO = new RentTenantFormDTO(); List images = new ArrayList<>(); formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId()); @@ -184,9 +183,8 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl imgList = rentContractFileService.list(imgParams); - tenant.setImgList(imgList); - tenant.getImgList().forEach(img -> { + imgList.forEach(img -> { // 更新基础库的人员头像 IcResiUserAttachmentDTO image = new IcResiUserAttachmentDTO(); image.setAttachmentUrl(img.getFileUrl()); From 12a7619b3681db4abd6c9f361be529d427e03b96 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 29 Apr 2022 16:03:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E7=9A=84=E5=85=B3?= =?UTF-8?q?=E8=81=94ID=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/service/impl/RentContractInfoServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java index 50b4749..2089d45 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java @@ -176,12 +176,11 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl images = new ArrayList<>(); formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId()); formDTO.setIdCard(tenant.getIdCard()); - formDTO.setImages(images); formDTO.setType(NumConstant.ONE_STR); Map imgParams = new HashMap<>(4); - tenantParams.put("referenceId", tenant.getId()); - tenantParams.put("fileType", NumConstant.ZERO_STR); + imgParams.put("referenceId", tenant.getId()); + imgParams.put("fileType", NumConstant.ZERO_STR); List imgList = rentContractFileService.list(imgParams); imgList.forEach(img -> { @@ -262,7 +261,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl { + tenantList.forEach(tenant -> { if (null == tenant.getImgList() || tenant.getImgList().isEmpty()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "租客照片不能为空"); } else { From af79b67910d240d31737d36b0313e0eb9a90db3e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 29 Apr 2022 16:24:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=80=A7=E5=88=AB?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/rent/service/impl/RentContractInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java index 2089d45..6db1756 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.IdCardNoValidatorUtils; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.IcResiUserAttachmentDTO; import com.epmet.dto.IcResiUserDTO; @@ -203,6 +204,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId());