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); - }); } }