From 8a6375edade9f1edc194a0381369fe94e56c13c7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 13 八月 2021 13:16:36 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 553 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 406 insertions(+), 147 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..394e152 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("开始查询小区街路巷是否存在完成");
@@ -731,14 +780,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 +812,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 +996,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 +1028,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 +1212,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 +1244,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 +1428,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 +1460,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 +1644,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 +1676,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 +1860,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 +1892,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 +2076,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 +2108,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 +2292,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 +2324,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 +2508,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 +2540,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 +2728,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 +2760,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("开始查询小区街路巷是否存在完成");
@@ -3040,6 +3219,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 +3267,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 +3315,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 +3363,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 +3411,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 +3459,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 +3507,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 +3555,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 +3603,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 +3651,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)) {
@@ -4743,9 +5002,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