From e8b78663379e26f5cf9f4f0f089e230173ee1e20 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 28 Jul 2022 16:09:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8PC?= =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../power/dto/rent/RentContractInfoDTO.java | 5 ++ .../RentContractInfoController.java | 18 +++++ .../rent/entity/RentContractInfoEntity.java | 5 ++ .../rent/service/RentContractInfoService.java | 22 +++++- .../impl/RentContractInfoServiceImpl.java | 79 +++++++++++++++++++ ...__pli_rent_contract_info_add_isPcInput.sql | 1 + .../mapper/rent/RentContractInfoDao.xml | 8 +- 7 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.13__pli_rent_contract_info_add_isPcInput.sql diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java index e0351b5..6e38aa5 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java @@ -212,4 +212,9 @@ public class RentContractInfoDTO implements Serializable { * 是否黑名单 */ private String isBlack; + + /** + * 是否是PC录入（0：否，1：是） + */ + private String isPcInput; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java index 5516860..f559bdb 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java @@ -54,6 +54,15 @@ public class RentContractInfoController { return new Result(); } + @NoRepeatSubmit + @PostMapping("savePc") + public Result savePc(@RequestBody RentContractInfoDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + rentContractInfoService.savePc(dto); + return new Result(); + } + @NoRepeatSubmit @PostMapping("review") public Result review(@RequestBody RentContractInfoDTO dto) { @@ -89,6 +98,15 @@ public class RentContractInfoController { return new Result(); } + @NoRepeatSubmit + @PostMapping("updatePc") + public Result updatePc(@RequestBody RentContractInfoDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + rentContractInfoService.updatePc(dto); + return new Result(); + } + @DeleteMapping("delete") public Result delete(@RequestBody String[] ids) { //效验数据 diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractInfoEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractInfoEntity.java index 22091f2..2230ff3 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractInfoEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractInfoEntity.java @@ -171,4 +171,9 @@ public class RentContractInfoEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 是否是PC录入（0：否，1：是） + */ + private String isPcInput; + } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java index 742834f..c776310 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java @@ -57,6 +57,16 @@ public interface RentContractInfoService extends BaseService 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); + } + + } + @Override @Transactional(rollbackFor = Exception.class) public void review(RentContractInfoDTO dto) { @@ -323,6 +394,14 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl SELECT i.*, - IF - ( b.id IS NULL, '否', '是' ) AS isBlack + IF( b.id IS NULL, '否', '是' ) AS isBlack FROM pli_rent_contract_info i LEFT JOIN pli_rent_blacklist b ON i.LESSEE_ID_CARD = b.ID_CARD AND b.DEL_FLAG = '0' WHERE i.DEL_FLAG = '0' + + AND i.IS_PC_INPUT = #{isPcInput} + AND i.CUSTOMER_ID = #{customerId} @@ -116,4 +118,4 @@ - \ No newline at end of file + From 9c88819121838f98a8a2c0c8b6f3ac574cf63855 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 29 Jul 2022 10:23:19 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8PC?= =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/service/impl/RentContractInfoServiceImpl.java | 7 ++++++- .../src/main/resources/mapper/rent/RentContractInfoDao.xml | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) 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 d7ad636..47f3588 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 @@ -192,9 +192,14 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl + order by i.CREATED_TIME desc From 82f84a4ff549bc915ca118bb9a0921e8cff85d36 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 29 Jul 2022 10:29:05 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8PC?= =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/rent/service/impl/RentContractInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 47f3588..b8f74a7 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 @@ -207,7 +207,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl tenantParams = new HashMap<>(4); From 0559aecf0911cd98d375ed5f8893c53a25b0924b Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 1 Aug 2022 15:54:37 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8PC?= =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/rent/RentContractInfoDao.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml index 37eca07..61949a3 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml @@ -43,8 +43,11 @@ LEFT JOIN pli_rent_blacklist b ON i.LESSEE_ID_CARD = b.ID_CARD AND b.DEL_FLAG = '0' WHERE i.DEL_FLAG = '0' - - AND i.IS_PC_INPUT = #{isPcInput} + + AND i.IS_PC_INPUT = '1' + + + AND i.IS_PC_INPUT != '1' AND i.CUSTOMER_ID = #{customerId} From 2825bedf12ae0757780bfc13951922058c6e8cf0 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 1 Aug 2022 16:10:26 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8PC?= =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/rent/RentContractInfoDao.xml | 43 +++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml index 61949a3..88f3c96 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml @@ -36,7 +36,44 @@