From 8d34c9a9392b89bcdc14ea5f9c9b27c08ffcaf27 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 23 六月 2021 18:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 10e5eac..c385ad5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -376,11 +376,11 @@
.eq(ComMngPopulationDO::getCardNo, cardNoAES));
if (populationDO == null) {
//不存在实有人口,则新增
- populationDO = savePopulationDO(vo, comActDO, comMngVillageDO, cardNoAES);
+ populationDO = savePopulationDO(vo, comActDO, comMngVillageDO);
} else {
//如果存在人口信息，且是自用房，则更新人口默认的房屋信息
if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
- populationDO = updatePopulationHouseUse(vo, populationDO, cardNoAES);
+ populationDO = updatePopulationHouseUse(vo, populationDO);
}
}
@@ -413,22 +413,23 @@
return R.ok();
}
- private ComMngPopulationDO updatePopulationHouseUse(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO, String cardNoAES) throws Exception {
+ private ComMngPopulationDO updatePopulationHouseUse(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO) throws Exception {
populationDO.setRoad(vo.getRoad());
populationDO.setDoorNo(vo.getDoorNo());
populationDO.setFloor(vo.getFloor());
populationDO.setUnitNo(vo.getUnitNo());
populationDO.setHouseNo(vo.getHouseNo());
- populationDO.setCardNo(cardNoAES);
+ populationDO.setCardNo(vo.getCardNo());
populationDO.setCardNoStr(vo.getCardNo());
if (StringUtils.isNotEmpty(populationDO.getPhone())) {
- populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey));
+// populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey));
+ populationDO.setPhone(populationDO.getPhone());
}
this.baseMapper.updateById(populationDO);
return populationDO;
}
- private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngVillageDO comMngVillageDO, String cardNoAES) {
+ private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngVillageDO comMngVillageDO) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
populationDO.setId(Snowflake.getId());
@@ -438,7 +439,7 @@
populationDO.setStreetId(comActDO.getStreetId());
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
- populationDO.setCardNo(cardNoAES);
+ populationDO.setCardNo(vo.getCardNo());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
this.baseMapper.insert(populationDO);
--
Gitblit v1.7.1