From 9074321af53e9005d7cf183e03441186b26975be Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 5 May 2022 14:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E4=B8=9C=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RentContractInfoServiceImpl.java       | 17 +++++++++--------
 .../service/impl/RentTenantInfoServiceImpl.java | 11 ++++++++++-
 .../resources/mapper/rent/RentTenantInfoDao.xml |  3 +++
 3 files changed, 22 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 e90f359..3ea39be 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
@@ -122,26 +122,27 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         RentContractInfoEntity entity = baseDao.selectById(id);
         RentContractInfoDTO dto = ConvertUtils.sourceToTarget(entity, RentContractInfoDTO.class);
 
+        // 取出租客信息
         Map<String, Object> params = new HashMap<>(4);
         params.put("contractId", id);
-
-        // 取出租客信息
         List<RentTenantInfoDTO> tenantList = rentTenantInfoService.list(params);
 
         tenantList.forEach(item -> {
             // 租客信息补充照片信息
-            params.put("referenceId", item.getId());
-            params.put("fileType", NumConstant.ZERO_STR);
-            List<RentContractFileDTO> imgList = rentContractFileService.list(params);
+            Map<String, Object> imgParams = new HashMap<>(4);
+            imgParams.put("referenceId", item.getId());
+            imgParams.put("fileType", NumConstant.ZERO_STR);
+            List<RentContractFileDTO> imgList = rentContractFileService.list(imgParams);
             item.setImgList(imgList);
         });
         dto.setTenantList(tenantList);
         dto.setTenantNum(tenantList.size());
 
-        params.put("referenceId", dto.getId());
-        params.put("fileType", NumConstant.ONE_STR);
         // 取出合同文件信息
-        List<RentContractFileDTO> fileList = rentContractFileService.list(params);
+        Map<String, Object> fileParams = new HashMap<>(4);
+        fileParams.put("referenceId", dto.getId());
+        fileParams.put("fileType", NumConstant.ONE_STR);
+        List<RentContractFileDTO> fileList = rentContractFileService.list(fileParams);
         dto.setFileList(fileList);
 
         return dto;
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java
index 05700f3..1bf647c 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java
@@ -12,6 +12,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcResiUserAttachmentDTO;
 import com.epmet.dto.form.RentTenantFormDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.plugin.power.dto.rent.RentContractFileDTO;
 import com.epmet.plugin.power.dto.rent.RentTenantInfoDTO;
 import com.epmet.plugin.power.modules.rent.dao.RentTenantInfoDao;
 import com.epmet.plugin.power.modules.rent.entity.RentContractFileEntity;
@@ -87,8 +88,16 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
 
     @Override
     public RentTenantInfoDTO get(String id) {
+        RentTenantInfoDTO dto;
         RentTenantInfoEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, RentTenantInfoDTO.class);
+        dto = ConvertUtils.sourceToTarget(entity, RentTenantInfoDTO.class);
+        // 补充照片信息
+        Map<String, Object> params = new HashMap<>(4);
+        params.put("referenceId", id);
+        params.put("fileType", NumConstant.ZERO_STR);
+        List<RentContractFileDTO> imgList = rentContractFileService.list(params);
+        dto.setImgList(imgList);
+        return dto;
     }
 
     @Override
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
index 48dfab1..8c84061 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
@@ -62,5 +62,8 @@
         <if test="idCard != null and idCard != ''">
             AND ID_CARD LIKE concat('%', #{idCard}, '%')
         </if>
+        ORDER BY
+        UPDATED_TIME DESC,
+        CREATED_TIME DESC
     </select>
 </mapper>
\ No newline at end of file