From c92f77ac03a1bbe3009891ce1d1f57f2d1091572 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 24 八月 2021 15:00:25 +0800
Subject: [PATCH] 提交预约登记小程序相关代码
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 724 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 546 insertions(+), 178 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 1cdaf08..60f59a4 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
@@ -244,84 +244,120 @@
}
//吸毒信息
- ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
- ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectOne(new QueryWrapper<ComDrugPopulationDO>().
+ List<ComDrugPopulationVO> comDrugPopulationVOs = new ArrayList<>();
+ List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(new QueryWrapper<ComDrugPopulationDO>().
lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
- if (null != comDrugPopulationDO) {
- BeanUtils.copyProperties(comDrugPopulationDO, comDrugPopulationVO);
- comMngPopulationVO.setComDrugPopulationVO(comDrugPopulationVO);
+ if (!comDrugPopulationDOs.isEmpty()) {
+ comDrugPopulationDOs.forEach(comDrugPopulationDO -> {
+ ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
+ BeanUtils.copyProperties(comDrugPopulationDO, comDrugPopulationVO);
+ comDrugPopulationVOs.add(comDrugPopulationVO);
+ comMngPopulationVO.setComDrugPopulationVOs(comDrugPopulationVOs);
+ });
}
//社区矫正信息
- ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
- ComCorrectPopulationDO comCorrectPopulationDO = comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().
+ List<ComCorrectPopulationVO> comCorrectPopulationVOS = new ArrayList<>();
+ List<ComCorrectPopulationDO> comCorrectPopulationDOS = comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().
lambda().eq(ComCorrectPopulationDO::getPopulationId, populationId));
- if (null != comCorrectPopulationDO) {
- BeanUtils.copyProperties(comCorrectPopulationDO, comCorrectPopulationVO);
- comMngPopulationVO.setComCorrectPopulationVO(comCorrectPopulationVO);
+ if (!comCorrectPopulationDOS.isEmpty()) {
+ comCorrectPopulationDOS.forEach(comCorrectPopulationDO -> {
+ ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
+ BeanUtils.copyProperties(comCorrectPopulationDO, comCorrectPopulationVO);
+ comCorrectPopulationVOS.add(comCorrectPopulationVO);
+ comMngPopulationVO.setComCorrectPopulationVOs(comCorrectPopulationVOS);
+ });
}
//精神障碍信息
- ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
- ComMajorPopulationDO comMajorPopulationDO = comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().
+ List<ComMajorPopulationVO> comMajorPopulationVOS = new ArrayList<>();
+ List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(new QueryWrapper<ComMajorPopulationDO>().
lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
- if (null != comMajorPopulationDO) {
- BeanUtils.copyProperties(comMajorPopulationDO, comMajorPopulationVO);
- comMngPopulationVO.setComMajorPopulationVO(comMajorPopulationVO);
+ if (!comMajorPopulationDOs.isEmpty()) {
+ comMajorPopulationDOs.forEach(comMajorPopulationDO -> {
+ ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
+ BeanUtils.copyProperties(comMajorPopulationDO, comMajorPopulationVO);
+ comMajorPopulationVOS.add(comMajorPopulationVO);
+ comMngPopulationVO.setComMajorPopulationVOs(comMajorPopulationVOS);
+ });
}
//邪教信息
- ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
- ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectOne(new QueryWrapper<ComCultPopulationDO>().
+ List<ComCultPopulationVO> comCultPopulationVOS = new ArrayList<>();
+ List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(new QueryWrapper<ComCultPopulationDO>().
lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
- if (null != comCultPopulationDO) {
- BeanUtils.copyProperties(comCultPopulationDO, comCultPopulationVO);
- comMngPopulationVO.setComCultPopulationVO(comCultPopulationVO);
+ if (!comCultPopulationDOS.isEmpty()) {
+ comCultPopulationDOS.forEach(comCultPopulationDO -> {
+ ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
+ BeanUtils.copyProperties(comCultPopulationDO, comCultPopulationVO);
+ comCultPopulationVOS.add(comCultPopulationVO);
+ comMngPopulationVO.setComCultPopulationVOs(comCultPopulationVOS);
+ });
}
//刑释信息
- ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
- ComRehabilitationPopulationDO comRehabilitationPopulationDO = comRehabilitationPopulationDAO.selectOne(new QueryWrapper<ComRehabilitationPopulationDO>().
+ List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOS = new ArrayList<>();
+ List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS = comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().
lambda().eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
- if (null != comRehabilitationPopulationDO) {
- BeanUtils.copyProperties(comRehabilitationPopulationDO, comRehabilitationPopulationVO);
- comMngPopulationVO.setComRehabilitationPopulationVO(comRehabilitationPopulationVO);
+ if (!comRehabilitationPopulationDOS.isEmpty()) {
+ comRehabilitationPopulationDOS.forEach(comRehabilitationPopulationDO -> {
+ ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
+ BeanUtils.copyProperties(comRehabilitationPopulationDO, comRehabilitationPopulationVO);
+ comRehabilitationPopulationVOS.add(comRehabilitationPopulationVO);
+ comMngPopulationVO.setComRehabilitationPopulationVOs(comRehabilitationPopulationVOS);
+ });
}
//上访信息
- ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
- ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>().
+ List<ComKeyPopulationVO> comKeyPopulationVOS = new ArrayList<>();
+ List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(new QueryWrapper<ComKeyPopulationDO>().
lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
- if (null != comRehabilitationPopulationDO) {
- BeanUtils.copyProperties(comKeyPopulationDO, comKeyPopulationVO);
- comMngPopulationVO.setComKeyPopulationVO(comKeyPopulationVO);
+ if (!comKeyPopulationDOS.isEmpty()) {
+ comKeyPopulationDOS.forEach(comKeyPopulationDO -> {
+ ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
+ BeanUtils.copyProperties(comKeyPopulationDO, comKeyPopulationVO);
+ comKeyPopulationVOS.add(comKeyPopulationVO);
+ comMngPopulationVO.setComKeyPopulationVOs(comKeyPopulationVOS);
+ });
}
//退役军人信息
- ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
- ComVeteransPopulationDO comVeteransPopulationDO = comVeteransPopulationDAO.selectOne(new QueryWrapper<ComVeteransPopulationDO>().
+ List<ComVeteransPopulationVO> comVeteransPopulationVOS = new ArrayList<>();
+ List<ComVeteransPopulationDO> comVeteransPopulationDOS = comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().
lambda().eq(ComVeteransPopulationDO::getPopulationId, populationId));
- if (null != comRehabilitationPopulationDO) {
- BeanUtils.copyProperties(comVeteransPopulationDO, comVeteransPopulationVO);
- comMngPopulationVO.setComVeteransPopulationVO(comVeteransPopulationVO);
+ if (!comVeteransPopulationDOS.isEmpty()) {
+ comVeteransPopulationDOS.forEach(comVeteransPopulationDO -> {
+ ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
+ BeanUtils.copyProperties(comVeteransPopulationDO, comVeteransPopulationVO);
+ comVeteransPopulationVOS.add(comVeteransPopulationVO);
+ comMngPopulationVO.setComVeteransPopulationVOs(comVeteransPopulationVOS);
+ });
}
//残疾人信息
- ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
- ComDisabilityPopulationDO comDisabilityPopulationDO = comDisabilityPopulationDAO.selectOne(new QueryWrapper<ComDisabilityPopulationDO>().
+ List<ComDisabilityPopulationVO> comDisabilityPopulationVOS = new ArrayList<>();
+ List<ComDisabilityPopulationDO> comDisabilityPopulationDOS = comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().
lambda().eq(ComDisabilityPopulationDO::getPopulationId, populationId));
- if (null != comRehabilitationPopulationDO) {
- BeanUtils.copyProperties(comDisabilityPopulationDO, comDisabilityPopulationVO);
- comMngPopulationVO.setComDisabilityPopulationVO(comDisabilityPopulationVO);
+ if (!comDisabilityPopulationDOS.isEmpty()) {
+ comDisabilityPopulationDOS.forEach(comDisabilityPopulationDO -> {
+ ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
+ BeanUtils.copyProperties(comDisabilityPopulationDO, comDisabilityPopulationVO);
+ comDisabilityPopulationVOS.add(comDisabilityPopulationVO);
+ comMngPopulationVO.setComDisabilityPopulationVOs(comDisabilityPopulationVOS);
+ });
}
//低保户信息
- ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
- ComLowSecurityPopulationDO comLowSecurityPopulationDO = comLowSecurityPopulationDAO.selectOne(new QueryWrapper<ComLowSecurityPopulationDO>().
+ List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOS = new ArrayList<>();
+ List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS = comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().
lambda().eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
- if (null != comRehabilitationPopulationDO) {
- BeanUtils.copyProperties(comLowSecurityPopulationDO, comLowSecurityPopulationVO);
- comMngPopulationVO.setComLowSecurityPopulationVO(comLowSecurityPopulationVO);
+ if (!comLowSecurityPopulationDOS.isEmpty()) {
+ comLowSecurityPopulationDOS.forEach(comLowSecurityPopulationDO -> {
+ ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
+ BeanUtils.copyProperties(comLowSecurityPopulationDO, comLowSecurityPopulationVO);
+ comLowSecurityPopulationVOS.add(comLowSecurityPopulationVO);
+ comMngPopulationVO.setComLowSecurityPopulationVOs(comLowSecurityPopulationVOS);
+ });
}
return R.ok(comMngPopulationVO);
}
@@ -528,14 +564,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -554,9 +596,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -600,6 +649,12 @@
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
ComMngPopulationDO updatePopulationDO = updatePopulationDO(vo,populationDO,labelList);
updateList.add(updatePopulationDO);
+
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ BeanUtils.copyProperties(vo,mistake);
+ setMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在，执行更新，社区id：："+ populationDO.getActId());
+ mistakes.add(mistake);
}else{
//不存在实有人口,则新增
populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO,labelList);
@@ -731,14 +786,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -757,9 +818,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -934,14 +1002,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -960,9 +1034,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -1137,14 +1218,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -1163,9 +1250,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -1340,14 +1434,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -1366,9 +1466,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -1543,14 +1650,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -1569,9 +1682,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -1746,14 +1866,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -1772,9 +1898,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -1949,14 +2082,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -1975,9 +2114,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -2152,14 +2298,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -2178,9 +2330,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -2355,14 +2514,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -2381,9 +2546,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -2562,14 +2734,20 @@
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
}
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
}
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
}
log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
@@ -2588,9 +2766,16 @@
}
StringBuilder address = new StringBuilder();
address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
- .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
-
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
+ if (StringUtils.isNotEmpty(vo.getFloor())) {
+ address.append(vo.getFloor()).append("栋");
+ }
+ if (StringUtils.isNotEmpty(vo.getUnitNo())) {
+ address.append(vo.getUnitNo()).append("单元");
+ }
+ if (StringUtils.isNotEmpty(vo.getHouseNo())) {
+ address.append(vo.getHouseNo()).append("号");
+ }
vo.setAddress(address.toString());
log.info("开始查询小区街路巷是否存在完成");
@@ -2721,7 +2906,6 @@
BeanUtils.copyProperties(vo, populationDO);
ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectOne(new QueryWrapper<ComDrugPopulationDO>().lambda()
.eq(ComDrugPopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comDrugPopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2738,8 +2922,20 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comDrugPopulationDO.setCardNo(cardNoAES);
- comDrugPopulationDAO.updateById(comDrugPopulationDO);
+
+ if (comDrugPopulationDO != null) {
+ BeanUtils.copyProperties(vo, comDrugPopulationDO);
+ comDrugPopulationDO.setCardNo(cardNoAES);
+ comDrugPopulationDAO.updateById(comDrugPopulationDO);
+ }else {
+ comDrugPopulationDO = new ComDrugPopulationDO();
+ BeanUtils.copyProperties(vo, comDrugPopulationDO);
+ comDrugPopulationDO.setId(Snowflake.getId());
+ comDrugPopulationDO.setPopulationId(populationDO.getId());
+ comDrugPopulationDO.setCommunityId(populationDO.getActId());
+ comDrugPopulationDO.setStreetId(populationDO.getStreetId());
+ comDrugPopulationDAO.insert(comDrugPopulationDO);
+ }
return populationDO;
}
@@ -2747,7 +2943,6 @@
BeanUtils.copyProperties(vo, populationDO);
ComCorrectPopulationDO comCorrectPopulationDO = comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().lambda()
.eq(ComCorrectPopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comCorrectPopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2764,8 +2959,19 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comCorrectPopulationDO.setCardNo(cardNoAES);
- comCorrectPopulationDAO.updateById(comCorrectPopulationDO);
+ if (comCorrectPopulationDO != null) {
+ BeanUtils.copyProperties(vo, comCorrectPopulationDO);
+ comCorrectPopulationDO.setCardNo(cardNoAES);
+ comCorrectPopulationDAO.updateById(comCorrectPopulationDO);
+ }else {
+ comCorrectPopulationDO = new ComCorrectPopulationDO();
+ BeanUtils.copyProperties(vo, comCorrectPopulationDO);
+ comCorrectPopulationDO.setId(Snowflake.getId());
+ comCorrectPopulationDO.setPopulationId(populationDO.getId());
+ comCorrectPopulationDO.setCommunityId(populationDO.getActId());
+ comCorrectPopulationDO.setStreetId(populationDO.getStreetId());
+ comCorrectPopulationDAO.insert(comCorrectPopulationDO);
+ }
return populationDO;
}
@@ -2773,7 +2979,6 @@
BeanUtils.copyProperties(vo, populationDO);
ComMajorPopulationDO comMajorPopulationDO = comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().lambda()
.eq(ComMajorPopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comMajorPopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2790,8 +2995,19 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comMajorPopulationDO.setCardNo(cardNoAES);
- comMajorPopulationDAO.updateById(comMajorPopulationDO);
+ if (comMajorPopulationDO != null) {
+ BeanUtils.copyProperties(vo, comMajorPopulationDO);
+ comMajorPopulationDO.setCardNo(cardNoAES);
+ comMajorPopulationDAO.updateById(comMajorPopulationDO);
+ }else {
+ comMajorPopulationDO = new ComMajorPopulationDO();
+ BeanUtils.copyProperties(vo, comMajorPopulationDO);
+ comMajorPopulationDO.setId(Snowflake.getId());
+ comMajorPopulationDO.setPopulationId(populationDO.getId());
+ comMajorPopulationDO.setCommunityId(populationDO.getActId());
+ comMajorPopulationDO.setStreetId(populationDO.getStreetId());
+ comMajorPopulationDAO.insert(comMajorPopulationDO);
+ }
return populationDO;
}
@@ -2799,7 +3015,6 @@
BeanUtils.copyProperties(vo, populationDO);
ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectOne(new QueryWrapper<ComCultPopulationDO>().lambda().
eq(ComCultPopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comCultPopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2816,8 +3031,19 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comCultPopulationDO.setCardNo(cardNoAES);
- comCultPopulationDAO.updateById(comCultPopulationDO);
+ if (comCultPopulationDO != null) {
+ BeanUtils.copyProperties(vo, comCultPopulationDO);
+ comCultPopulationDO.setCardNo(cardNoAES);
+ comCultPopulationDAO.updateById(comCultPopulationDO);
+ }else {
+ comCultPopulationDO = new ComCultPopulationDO();
+ BeanUtils.copyProperties(vo, comCultPopulationDO);
+ comCultPopulationDO.setId(Snowflake.getId());
+ comCultPopulationDO.setPopulationId(populationDO.getId());
+ comCultPopulationDO.setCommunityId(populationDO.getActId());
+ comCultPopulationDO.setStreetId(populationDO.getStreetId());
+ comCultPopulationDAO.insert(comCultPopulationDO);
+ }
return populationDO;
}
@@ -2825,7 +3051,6 @@
BeanUtils.copyProperties(vo, populationDO);
ComRehabilitationPopulationDO comRehabilitationPopulationDO = comRehabilitationPopulationDAO.selectOne(new QueryWrapper<ComRehabilitationPopulationDO>().lambda().
eq(ComRehabilitationPopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2842,8 +3067,20 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comRehabilitationPopulationDO.setCardNo(cardNoAES);
- comRehabilitationPopulationDAO.updateById(comRehabilitationPopulationDO);
+ if (comRehabilitationPopulationDO != null) {
+ BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
+ comRehabilitationPopulationDO.setCardNo(cardNoAES);
+ comRehabilitationPopulationDAO.updateById(comRehabilitationPopulationDO);
+ }else {
+ comRehabilitationPopulationDO = new ComRehabilitationPopulationDO();
+ BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
+ comRehabilitationPopulationDO.setId(Snowflake.getId());
+ comRehabilitationPopulationDO.setPopulationId(populationDO.getId());
+ comRehabilitationPopulationDO.setCommunityId(populationDO.getActId());
+ comRehabilitationPopulationDO.setStreetId(populationDO.getStreetId());
+ comRehabilitationPopulationDAO.insert(comRehabilitationPopulationDO);
+ }
+
return populationDO;
}
@@ -2851,7 +3088,6 @@
BeanUtils.copyProperties(vo, populationDO);
ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>().lambda().
eq(ComKeyPopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comKeyPopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2868,8 +3104,19 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comKeyPopulationDO.setCardNo(cardNoAES);
- comKeyPopulationDAO.updateById(comKeyPopulationDO);
+ if (comKeyPopulationDO != null) {
+ BeanUtils.copyProperties(vo, comKeyPopulationDO);
+ comKeyPopulationDO.setCardNo(cardNoAES);
+ comKeyPopulationDAO.updateById(comKeyPopulationDO);
+ }else {
+ comKeyPopulationDO = new ComKeyPopulationDO();
+ BeanUtils.copyProperties(vo, comKeyPopulationDO);
+ comKeyPopulationDO.setId(Snowflake.getId());
+ comKeyPopulationDO.setPopulationId(populationDO.getId());
+ comKeyPopulationDO.setCommunityId(populationDO.getActId());
+ comKeyPopulationDO.setStreetId(populationDO.getStreetId());
+ comKeyPopulationDAO.insert(comKeyPopulationDO);
+ }
return populationDO;
}
@@ -2877,7 +3124,6 @@
BeanUtils.copyProperties(vo, populationDO);
ComSentencePopulationDO comSentencePopulationDO = comSentencePopulationDAO.selectOne(new QueryWrapper<ComSentencePopulationDO>().lambda().
eq(ComSentencePopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comSentencePopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2894,8 +3140,19 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comSentencePopulationDO.setCardNo(cardNoAES);
- comSentencePopulationDAO.updateById(comSentencePopulationDO);
+ if (comSentencePopulationDO != null) {
+ BeanUtils.copyProperties(vo, comSentencePopulationDO);
+ comSentencePopulationDO.setCardNo(cardNoAES);
+ comSentencePopulationDAO.updateById(comSentencePopulationDO);
+ }else {
+ comSentencePopulationDO = new ComSentencePopulationDO();
+ BeanUtils.copyProperties(vo, comSentencePopulationDO);
+ comSentencePopulationDO.setId(Snowflake.getId());
+ comSentencePopulationDO.setPopulationId(populationDO.getId());
+ comSentencePopulationDO.setCommunityId(populationDO.getActId());
+ comSentencePopulationDO.setStreetId(populationDO.getStreetId());
+ comSentencePopulationDAO.insert(comSentencePopulationDO);
+ }
return populationDO;
}
@@ -2903,7 +3160,6 @@
BeanUtils.copyProperties(vo, populationDO);
ComVeteransPopulationDO comVeteransPopulationDO = comVeteransPopulationDAO.selectOne(new QueryWrapper<ComVeteransPopulationDO>().lambda().
eq(ComVeteransPopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comVeteransPopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2920,15 +3176,25 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comVeteransPopulationDO.setCardNo(cardNoAES);
- comVeteransPopulationDAO.updateById(comVeteransPopulationDO);
+ if (comVeteransPopulationDO != null) {
+ BeanUtils.copyProperties(vo, comVeteransPopulationDO);
+ comVeteransPopulationDO.setCardNo(cardNoAES);
+ comVeteransPopulationDAO.updateById(comVeteransPopulationDO);
+ }else {
+ comVeteransPopulationDO = new ComVeteransPopulationDO();
+ BeanUtils.copyProperties(vo, comVeteransPopulationDO);
+ comVeteransPopulationDO.setId(Snowflake.getId());
+ comVeteransPopulationDO.setPopulationId(populationDO.getId());
+ comVeteransPopulationDO.setCommunityId(populationDO.getActId());
+ comVeteransPopulationDO.setStreetId(populationDO.getStreetId());
+ comVeteransPopulationDAO.insert(comVeteransPopulationDO);
+ }
return populationDO;
}
private ComMngPopulationDO updateDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
BeanUtils.copyProperties(vo, populationDO);
ComDisabilityPopulationDO comDisabilityPopulationDO = comDisabilityPopulationDAO.selectOne(new QueryWrapper<ComDisabilityPopulationDO>().lambda().
eq(ComDisabilityPopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2945,8 +3211,19 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comDisabilityPopulationDO.setCardNo(cardNoAES);
- comDisabilityPopulationDAO.updateById(comDisabilityPopulationDO);
+ if (comDisabilityPopulationDO != null) {
+ BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
+ comDisabilityPopulationDO.setCardNo(cardNoAES);
+ comDisabilityPopulationDAO.updateById(comDisabilityPopulationDO);
+ }else {
+ comDisabilityPopulationDO = new ComDisabilityPopulationDO();
+ BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
+ comDisabilityPopulationDO.setId(Snowflake.getId());
+ comDisabilityPopulationDO.setPopulationId(populationDO.getId());
+ comDisabilityPopulationDO.setCommunityId(populationDO.getActId());
+ comDisabilityPopulationDO.setStreetId(populationDO.getStreetId());
+ comDisabilityPopulationDAO.insert(comDisabilityPopulationDO);
+ }
return populationDO;
}
@@ -2954,7 +3231,6 @@
BeanUtils.copyProperties(vo, populationDO);
ComLowSecurityPopulationDO comLowSecurityPopulationDO = comLowSecurityPopulationDAO.selectOne(new QueryWrapper<ComLowSecurityPopulationDO>().lambda().
eq(ComLowSecurityPopulationDO::getPopulationId, populationDO.getId()));
- BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
Iterator<String> iterator = userTag.iterator();
@@ -2971,8 +3247,19 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
- comLowSecurityPopulationDO.setCardNo(cardNoAES);
- comLowSecurityPopulationDAO.updateById(comLowSecurityPopulationDO);
+ if (comLowSecurityPopulationDO != null) {
+ BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
+ comLowSecurityPopulationDO.setCardNo(cardNoAES);
+ comLowSecurityPopulationDAO.updateById(comLowSecurityPopulationDO);
+ }else {
+ comLowSecurityPopulationDO = new ComLowSecurityPopulationDO();
+ BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
+ comLowSecurityPopulationDO.setId(Snowflake.getId());
+ comLowSecurityPopulationDO.setPopulationId(populationDO.getId());
+ comLowSecurityPopulationDO.setCommunityId(populationDO.getActId());
+ comLowSecurityPopulationDO.setStreetId(populationDO.getStreetId());
+ comLowSecurityPopulationDAO.insert(comLowSecurityPopulationDO);
+ }
return populationDO;
}
@@ -3040,6 +3327,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -3080,6 +3375,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -3120,6 +3423,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -3160,6 +3471,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -3200,6 +3519,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -3240,6 +3567,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -3280,6 +3615,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -3320,6 +3663,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -3360,6 +3711,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -3400,6 +3759,14 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setCardNo(cardNoAES);
//新增的时候默认绑定房屋id
// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -4204,7 +4571,8 @@
}
} else {
//新增
- Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
+ Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName())
+ .eq(ComMngUserTagDO::getCommunityId, comMngTagVO.getCommunityId()));
if (count > 0) {
return R.fail("该标签已存在，标签名称重复");
}
@@ -4743,9 +5111,9 @@
}
comActPopulationScreenVO.setSpecialNum(specialNum.longValue());
//统计已使用社区通人数
-// Long count = populationDAO.countUsedCommunityPopulation(communityId);
-// comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
- comActPopulationScreenVO.setUsedCommunityNum(1183L);
+ Long count = populationDAO.countUsedCommunityPopulation(communityId);
+ comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
+// comActPopulationScreenVO.setUsedCommunityNum(1183L);
//统计性别
Map<String, Long> sexMap = populationDAO.countBySex(communityId);
--
Gitblit v1.7.1