From 697ad11caeb383da604cff26af911b34df97d90c Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 29 Apr 2022 13:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AE=9E=E4=BD=93=E7=B1=BB?=
 =?UTF-8?q?=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<RentContractInf
         updateById(entity);
         // 如果审核通过，就去更新基础库头像信息以及居民信息
         if (NumConstant.ONE_STR.equals(entity.getState())) {
-            dto.getTenantList().forEach(tenant -> {
+            // 获取基本信息
+            RentContractInfoDTO contractDto = get(dto.getId());
+
+            // 获取租客信息
+            Map<String, Object> tenantParams = new HashMap<>(4);
+            tenantParams.put("contractId", contractDto.getId());
+            List<RentTenantInfoDTO> tenantList = rentTenantInfoService.list(tenantParams);
+            contractDto.setTenantList(tenantList);
+
+            contractDto.getTenantList().forEach(tenant -> {
                 RentTenantFormDTO formDTO = new RentTenantFormDTO();
                 List<IcResiUserAttachmentDTO> images = new ArrayList<>();
                 formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());
@@ -171,6 +180,12 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                 formDTO.setImages(images);
                 formDTO.setType(NumConstant.ONE_STR);
 
+                Map<String, Object> imgParams = new HashMap<>(4);
+                tenantParams.put("referenceId", tenant.getId());
+                tenantParams.put("fileType", NumConstant.ZERO_STR);
+                List<RentContractFileDTO> imgList = rentContractFileService.list(imgParams);
+                tenant.setImgList(imgList);
+
                 tenant.getImgList().forEach(img -> {
                     // 更新基础库的人员头像
                     IcResiUserAttachmentDTO image = new IcResiUserAttachmentDTO();
@@ -183,24 +198,23 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                 // 初始化居民信息
                 IcResiUserDTO user = new IcResiUserDTO();
                 user.setCustomerId(loginUserUtil.getLoginUserCustomerId());
-                user.setGridId(dto.getGridId());
-                user.setVillageId(dto.getVillageId());
-                user.setBuildId(dto.getBuildId());
-                user.setUnitId(dto.getUnitId());
-                user.setHomeId(dto.getHomeId());
+                user.setGridId(contractDto.getGridId());
+                user.setVillageId(contractDto.getVillageId());
+                user.setBuildId(contractDto.getBuildId());
+                user.setUnitId(contractDto.getUnitId());
+                user.setHomeId(contractDto.getHomeId());
                 user.setName(tenant.getName());
                 user.setIdCard(tenant.getIdCard());
                 user.setMobile(tenant.getMobile());
 
-                user.setAgencyId(dto.getCommunityId());
-                Result<CustomerAgencyDTO> agencyInfo = govOrgOpenFeignClient.getAgencyById(dto.getCommunityId());
+                user.setAgencyId(contractDto.getCommunityId());
+                Result<CustomerAgencyDTO> agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId());
                 user.setPids(agencyInfo.getData().getPids());
 
                 formDTO.setUser(user);
 
                 epmetUserOpenFeignClient.updateImage(formDTO);
 
-
             });
         }
     }