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 e29f9f5..4e16ba4 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 @@ -194,7 +194,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl tenantParams = new HashMap<>(4); - tenantParams.put("contractId", contractDto.getId()); - List tenantList = rentTenantInfoService.list(tenantParams); - - tenantList.forEach(tenant -> { - RentTenantFormDTO formDTO = new RentTenantFormDTO(); - List images = new ArrayList<>(); - formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - formDTO.setIdCard(tenant.getIdCard()); - formDTO.setType(NumConstant.ONE_STR); - - List imgList = rentContractFileService.listByRefAndType(tenant.getId(), NumConstant.ZERO_STR); - - imgList.forEach(img -> { - // 更新基础库的人员头像 - IcResiUserAttachmentDTO image = new IcResiUserAttachmentDTO(); - image.setAttachmentUrl(img.getFileUrl()); - image.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - images.add(image); - }); - formDTO.setImages(images); - - // 初始化居民信息 - IcResiUserDTO user = new IcResiUserDTO(); - user.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - 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.setGender(IdCardNoValidatorUtils.getGender(tenant.getIdCard())); - - user.setAgencyId(contractDto.getCommunityId()); - Result agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId()); - user.setPids(agencyInfo.getData().getPids()); - - formDTO.setUser(user); - - epmetUserOpenFeignClient.updateImage(formDTO); - - }); - - // 更新房屋的状态为租赁 - Result houseInfo = govOrgOpenFeignClient.get(dto.getHomeId()); - IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(houseInfo.getData(), IcHouseAddFormDTO.class); - formDTO.setRentFlag(NumConstant.ONE); - formDTO.setHouseId(dto.getHomeId()); - govOrgOpenFeignClient.houseUpdate(formDTO); - } +// if (NumConstant.ONE_STR.equals(entity.getState())) { +// // 获取基本信息 +// RentContractInfoDTO contractDto = get(entity.getId()); +// +// // 获取租客信息 +// Map tenantParams = new HashMap<>(4); +// tenantParams.put("contractId", contractDto.getId()); +// List tenantList = rentTenantInfoService.list(tenantParams); +// +// tenantList.forEach(tenant -> { +// RentTenantFormDTO formDTO = new RentTenantFormDTO(); +// List images = new ArrayList<>(); +// formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId()); +// formDTO.setIdCard(tenant.getIdCard()); +// formDTO.setType(NumConstant.ONE_STR); +// +// List imgList = rentContractFileService.listByRefAndType(tenant.getId(), NumConstant.ZERO_STR); +// +// imgList.forEach(img -> { +// // 更新基础库的人员头像 +// IcResiUserAttachmentDTO image = new IcResiUserAttachmentDTO(); +// image.setAttachmentUrl(img.getFileUrl()); +// image.setCustomerId(loginUserUtil.getLoginUserCustomerId()); +// images.add(image); +// }); +// formDTO.setImages(images); +// +// // 初始化居民信息 +// IcResiUserDTO user = new IcResiUserDTO(); +// user.setCustomerId(loginUserUtil.getLoginUserCustomerId()); +// 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.setGender(IdCardNoValidatorUtils.getGender(tenant.getIdCard())); +// +// user.setAgencyId(contractDto.getCommunityId()); +// Result agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId()); +// user.setPids(agencyInfo.getData().getPids()); +// +// formDTO.setUser(user); +// +// epmetUserOpenFeignClient.updateImage(formDTO); +// +// }); +// +// // 更新房屋的状态为租赁 +// Result houseInfo = govOrgOpenFeignClient.get(dto.getHomeId()); +// IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(houseInfo.getData(), IcHouseAddFormDTO.class); +// formDTO.setRentFlag(NumConstant.ONE); +// formDTO.setHouseId(dto.getHomeId()); +// govOrgOpenFeignClient.houseUpdate(formDTO); +// } }