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 params = new HashMap<>(4); params.put("contractId", id); - - // 取出租客信息 List tenantList = rentTenantInfoService.list(params); tenantList.forEach(item -> { // 租客信息补充照片信息 - params.put("referenceId", item.getId()); - params.put("fileType", NumConstant.ZERO_STR); - List imgList = rentContractFileService.list(params); + Map imgParams = new HashMap<>(4); + imgParams.put("referenceId", item.getId()); + imgParams.put("fileType", NumConstant.ZERO_STR); + List 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 fileList = rentContractFileService.list(params); + Map fileParams = new HashMap<>(4); + fileParams.put("referenceId", dto.getId()); + fileParams.put("fileType", NumConstant.ONE_STR); + List 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 params = new HashMap<>(4); + params.put("referenceId", id); + params.put("fileType", NumConstant.ZERO_STR); + List 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 @@ AND ID_CARD LIKE concat('%', #{idCard}, '%') + ORDER BY + UPDATED_TIME DESC, + CREATED_TIME DESC \ No newline at end of file