From 7ff86ee9adfb437273af3f3c6dc4adf956a34a8b Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 11 八月 2021 09:07:52 +0800
Subject: [PATCH] 实有人口新增模板导入接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 582 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 571 insertions(+), 11 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 0c05d3c..1cdaf08 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
@@ -92,6 +92,26 @@
private BigScreenDAO bigScreenDAO;
@Resource
private ComMngUserTagDAO comMngUserTagDAO;
+ @Resource
+ private ComDrugPopulationDAO comDrugPopulationDAO;
+ @Resource
+ private ComCorrectPopulationDAO comCorrectPopulationDAO;
+ @Resource
+ private ComMajorPopulationDAO comMajorPopulationDAO;
+ @Resource
+ private ComCultPopulationDAO comCultPopulationDAO;
+ @Resource
+ private ComRehabilitationPopulationDAO comRehabilitationPopulationDAO;
+ @Resource
+ private ComKeyPopulationDAO comKeyPopulationDAO;
+ @Resource
+ private ComSentencePopulationDAO comSentencePopulationDAO;
+ @Resource
+ private ComVeteransPopulationDAO comVeteransPopulationDAO;
+ @Resource
+ private ComDisabilityPopulationDAO comDisabilityPopulationDAO;
+ @Resource
+ private ComLowSecurityPopulationDAO comLowSecurityPopulationDAO;
@Value("${domain.aesKey:}")
private String aesKey;
@@ -221,6 +241,87 @@
List<ComMngPopulationCarVO> carList = comMngCarDAO.getPopulationCarListByIdCard(comMngPopulationDO.getCardNo());
if (!carList.isEmpty()) {
comMngPopulationVO.setCarList(carList);
+ }
+
+ //吸毒信息
+ ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
+ ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectOne(new QueryWrapper<ComDrugPopulationDO>().
+ lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
+ if (null != comDrugPopulationDO) {
+ BeanUtils.copyProperties(comDrugPopulationDO, comDrugPopulationVO);
+ comMngPopulationVO.setComDrugPopulationVO(comDrugPopulationVO);
+ }
+
+ //社区矫正信息
+ ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
+ ComCorrectPopulationDO comCorrectPopulationDO = comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().
+ lambda().eq(ComCorrectPopulationDO::getPopulationId, populationId));
+ if (null != comCorrectPopulationDO) {
+ BeanUtils.copyProperties(comCorrectPopulationDO, comCorrectPopulationVO);
+ comMngPopulationVO.setComCorrectPopulationVO(comCorrectPopulationVO);
+ }
+
+ //精神障碍信息
+ ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
+ ComMajorPopulationDO comMajorPopulationDO = comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().
+ lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
+ if (null != comMajorPopulationDO) {
+ BeanUtils.copyProperties(comMajorPopulationDO, comMajorPopulationVO);
+ comMngPopulationVO.setComMajorPopulationVO(comMajorPopulationVO);
+ }
+
+ //邪教信息
+ ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
+ ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectOne(new QueryWrapper<ComCultPopulationDO>().
+ lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
+ if (null != comCultPopulationDO) {
+ BeanUtils.copyProperties(comCultPopulationDO, comCultPopulationVO);
+ comMngPopulationVO.setComCultPopulationVO(comCultPopulationVO);
+ }
+
+ //刑释信息
+ ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
+ ComRehabilitationPopulationDO comRehabilitationPopulationDO = comRehabilitationPopulationDAO.selectOne(new QueryWrapper<ComRehabilitationPopulationDO>().
+ lambda().eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
+ if (null != comRehabilitationPopulationDO) {
+ BeanUtils.copyProperties(comRehabilitationPopulationDO, comRehabilitationPopulationVO);
+ comMngPopulationVO.setComRehabilitationPopulationVO(comRehabilitationPopulationVO);
+ }
+
+ //上访信息
+ ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
+ ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>().
+ lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
+ if (null != comRehabilitationPopulationDO) {
+ BeanUtils.copyProperties(comKeyPopulationDO, comKeyPopulationVO);
+ comMngPopulationVO.setComKeyPopulationVO(comKeyPopulationVO);
+ }
+
+ //退役军人信息
+ ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
+ ComVeteransPopulationDO comVeteransPopulationDO = comVeteransPopulationDAO.selectOne(new QueryWrapper<ComVeteransPopulationDO>().
+ lambda().eq(ComVeteransPopulationDO::getPopulationId, populationId));
+ if (null != comRehabilitationPopulationDO) {
+ BeanUtils.copyProperties(comVeteransPopulationDO, comVeteransPopulationVO);
+ comMngPopulationVO.setComVeteransPopulationVO(comVeteransPopulationVO);
+ }
+
+ //残疾人信息
+ ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
+ ComDisabilityPopulationDO comDisabilityPopulationDO = comDisabilityPopulationDAO.selectOne(new QueryWrapper<ComDisabilityPopulationDO>().
+ lambda().eq(ComDisabilityPopulationDO::getPopulationId, populationId));
+ if (null != comRehabilitationPopulationDO) {
+ BeanUtils.copyProperties(comDisabilityPopulationDO, comDisabilityPopulationVO);
+ comMngPopulationVO.setComDisabilityPopulationVO(comDisabilityPopulationVO);
+ }
+
+ //低保户信息
+ ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
+ ComLowSecurityPopulationDO comLowSecurityPopulationDO = comLowSecurityPopulationDAO.selectOne(new QueryWrapper<ComLowSecurityPopulationDO>().
+ lambda().eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
+ if (null != comRehabilitationPopulationDO) {
+ BeanUtils.copyProperties(comLowSecurityPopulationDO, comLowSecurityPopulationVO);
+ comMngPopulationVO.setComLowSecurityPopulationVO(comLowSecurityPopulationVO);
}
return R.ok(comMngPopulationVO);
}
@@ -2387,6 +2488,213 @@
return R.ok(mistakes);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId) {
+ //需要新增的房屋集合
+ List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
+ //需要新增的人口集合
+ List<ComMngPopulationDO> saveList = new ArrayList<>();
+ //需要修改的人口集合
+ List<ComMngPopulationDO> updateList = new ArrayList<>();
+ //需要新增的吸毒人员集合
+ List<ComDrugPopulationDO> saveDrugList = new ArrayList<>();
+ //需要修改的吸毒人员集合
+ List<ComDrugPopulationDO> updateDrugList = new ArrayList<>();
+ //需要新增的人口与房屋关系集合
+ List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+
+ log.info("开始处理导入数据");
+ List<ComMngPopulationLowSecurityMistakeExcelVO> mistakes = new ArrayList<>();
+ try {
+ //查询社区信息
+ log.info("开始查询社区信息数据");
+ ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
+ if(populationActVO == null){
+ log.error("未查询到社区信息");
+ return R.fail("未查询到社区信息");
+ }
+ log.info("开始查询社区信息数据完成");
+
+ //查询当前社区标签列表
+ List<String> labelList = new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ }
+
+ StringBuilder areaPath = new StringBuilder();
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
+ //处理实有人口信息
+ Integer nub = 1;
+
+ //查询所有人口数据放入HashMap中
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ HashMap<String,Object> populationMap = new HashMap<>();
+ populationList.forEach(population -> {
+ String key = population.getCardNo();
+ populationMap.put(key,population);
+ });
+ //查询所有房屋信息放入到HashMap中
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ HashMap<String,Object> houseMap = new HashMap<>();
+ houseLists.forEach(house -> {
+ String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
+ houseMap.put(key,house);
+ });
+
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ HashMap<String,Object> villageMap = new HashMap<>();
+ villageList.forEach(village -> {
+ String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
+ villageMap.put(key,village);
+ });
+
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
+ HashMap<String,Object> houseUserMap = new HashMap<>();
+ houseUserLists.forEach(houseUser -> {
+ String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
+ houseUserMap.put(key,houseUser);
+ });
+
+
+ for (ComMngPopulationLowSecurityExcelVO vo : list) {
+ if (vo.getDoorNo().contains("号")) {
+ vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ }
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
+ log.info("开始查询小区街路巷是否存在");
+ //查询小区街路巷是否存在
+ ComMngVillageDO comMngVillageDO = null;
+ String villageKey = communityId + vo.getRoad() + vo.getDoorNo();
+ if(!isOnly(villageKey,villageMap)){
+ comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
+ }else{
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ BeanUtils.copyProperties(vo,mistake);
+ setLowSecurityMistake(mistake, vo);
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistakes.add(mistake);
+ log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ continue;
+ }
+ 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("号");
+
+ vo.setAddress(address.toString());
+ log.info("开始查询小区街路巷是否存在完成");
+
+ log.info("开始查询房屋是否存在");
+ //先判断房屋是否存在
+ ComMngPopulationHouseDO populationHouseDO = null;
+ String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
+ if(isOnly(houseKey,houseMap)){
+ if(!houseList.isEmpty()){
+ for (ComMngPopulationHouseDO house:houseList) {
+ if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
+ && house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
+ && house.getHouseNo().equals(vo.getHouseNo())){
+ populationHouseDO = house;
+ break;
+ }
+ }
+ }
+ if(populationHouseDO == null){
+ //房屋信息不存在建立房屋信息
+ populationHouseDO = saveLowSecurityPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ }else{
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ }
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("开始查询房屋是否存在完成");
+
+ if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
+ //空户处理完房屋信息，直接返回
+ continue;
+ }
+ String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ //判断实有人口是否已存在
+ log.info("开始查询实有人口是否已存在");
+ ComMngPopulationDO populationDO = null;
+ String populationKey = vo.getCardNo();
+ if(!isOnly(populationKey,populationMap)){
+ //存在实有人口信息，则更新
+ populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
+ ComMngPopulationDO updatePopulationDO = updateLowSecurityPopulationDO(vo,populationDO,labelList);
+ updateList.add(updatePopulationDO);
+ }else{
+ //不存在实有人口,则新增
+ populationDO = saveLowSecurityPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ saveList.add(populationDO);
+ }
+ log.info("开始查询实有人口是否已存在完成");
+
+ log.info("开始查询实有人口房屋居住信息");
+ //处理实有人口房屋居住信息
+ if (populationDO != null) {
+ ComMngPopulationHouseUserDO populationHouseUserDO = null;
+ String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
+ if(isOnly(houseUserKey,houseUserMap)){
+ populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setId(Snowflake.getId());
+ populationHouseUserDO.setHouseId(populationHouseDO.getId());
+ populationHouseUserDO.setPopulId(populationDO.getId());
+// populationHouseUserDO.setRelation(vo.getRelation());
+ populationHouseUserDO.setRelationId(vo.getIsRent());
+// populationHouseUserDO.setResidence(vo.getResidence());
+ houseUserList.add(populationHouseUserDO);
+ }
+ }
+ log.info("开始查询实有人口房屋居住信息完成");
+ }
+ }catch (Exception e){
+ log.info("出现错误，错误原因：" + e.getMessage());
+ }
+ log.info("处理完成导入数据");
+
+ log.info("开始执行数据库导入");
+ if(!houseList.isEmpty()){
+ log.info("执行数据库导入房屋");
+ comMngPopulationHouseDAO.insertAll(houseList);
+ log.info("执行数据库导入房屋完成");
+ }
+ if(!saveList.isEmpty()){
+ log.info("执行数据库导入人口");
+ this.baseMapper.insertAll(saveList);
+ log.info("执行数据库导入人口完成");
+ }
+ if(!updateList.isEmpty()){
+ log.info("执行数据库更新人口");
+ this.baseMapper.updateAll(updateList);
+// this.updateBatchById(updateList);
+ log.info("执行数据库更新人口完成");
+ }
+ if(!houseUserList.isEmpty()){
+ log.info("执行数据库导入人口房屋关系");
+ comMngPopulationHouseUserService.saveBatch(houseUserList);
+ log.info("执行数据库导入人口房屋关系完成");
+ }
+ log.info("执行数据库导入完成");
+
+ if (!mistakes.isEmpty()) {
+ log.info("返回错误数据");
+ return R.fail(mistakes);
+ }
+ return R.ok(mistakes);
+ }
+
private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
BeanUtils.copyProperties(vo, populationDO);
@@ -2411,6 +2719,9 @@
private ComMngPopulationDO updateDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
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();
@@ -2427,11 +2738,16 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
+ comDrugPopulationDO.setCardNo(cardNoAES);
+ comDrugPopulationDAO.updateById(comDrugPopulationDO);
return populationDO;
}
private ComMngPopulationDO updateCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
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();
@@ -2448,11 +2764,16 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
+ comCorrectPopulationDO.setCardNo(cardNoAES);
+ comCorrectPopulationDAO.updateById(comCorrectPopulationDO);
return populationDO;
}
private ComMngPopulationDO updateMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
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();
@@ -2469,11 +2790,16 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
+ comMajorPopulationDO.setCardNo(cardNoAES);
+ comMajorPopulationDAO.updateById(comMajorPopulationDO);
return populationDO;
}
private ComMngPopulationDO updateCultPopulationDO(ComMngPopulationCultExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
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();
@@ -2490,11 +2816,16 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
+ comCultPopulationDO.setCardNo(cardNoAES);
+ comCultPopulationDAO.updateById(comCultPopulationDO);
return populationDO;
}
private ComMngPopulationDO updateRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
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();
@@ -2511,11 +2842,16 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
+ comRehabilitationPopulationDO.setCardNo(cardNoAES);
+ comRehabilitationPopulationDAO.updateById(comRehabilitationPopulationDO);
return populationDO;
}
private ComMngPopulationDO updateKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
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();
@@ -2532,11 +2868,16 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
+ comKeyPopulationDO.setCardNo(cardNoAES);
+ comKeyPopulationDAO.updateById(comKeyPopulationDO);
return populationDO;
}
private ComMngPopulationDO updateSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
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();
@@ -2553,11 +2894,16 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
+ comSentencePopulationDO.setCardNo(cardNoAES);
+ comSentencePopulationDAO.updateById(comSentencePopulationDO);
return populationDO;
}
private ComMngPopulationDO updateVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
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();
@@ -2574,10 +2920,15 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
+ comVeteransPopulationDO.setCardNo(cardNoAES);
+ comVeteransPopulationDAO.updateById(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();
@@ -2594,6 +2945,34 @@
}
populationDO.setLabel(Joiner.on(",").join(userTag));
populationDO.setCardNo(cardNoAES);
+ comDisabilityPopulationDO.setCardNo(cardNoAES);
+ comDisabilityPopulationDAO.updateById(comDisabilityPopulationDO);
+ return populationDO;
+ }
+
+ private ComMngPopulationDO updateLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ 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();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCardNo(cardNoAES);
+ comLowSecurityPopulationDO.setCardNo(cardNoAES);
+ comLowSecurityPopulationDAO.updateById(comLowSecurityPopulationDO);
return populationDO;
}
@@ -2640,7 +3019,11 @@
private ComMngPopulationDO saveDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
- populationDO.setId(Snowflake.getId());
+ ComDrugPopulationDO comDrugPopulationDO = new ComDrugPopulationDO();
+ BeanUtils.copyProperties(vo, comDrugPopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comDrugPopulationDO.setPopulationId(populationId);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2666,13 +3049,21 @@
// }
// this.baseMapper.insert(populationDO);
+ comDrugPopulationDO.setId(Snowflake.getId());
+ comDrugPopulationDO.setCommunityId(comActDO.getCommunityId());
+ comDrugPopulationDO.setStreetId(comActDO.getStreetId());
+ comDrugPopulationDAO.insert(comDrugPopulationDO);
return populationDO;
}
private ComMngPopulationDO saveCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
- populationDO.setId(Snowflake.getId());
+ ComCorrectPopulationDO comCorrectPopulationDO = new ComCorrectPopulationDO();
+ BeanUtils.copyProperties(vo, comCorrectPopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comCorrectPopulationDO.setPopulationId(populationId);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2698,13 +3089,21 @@
// }
// this.baseMapper.insert(populationDO);
+ comCorrectPopulationDO.setId(Snowflake.getId());
+ comCorrectPopulationDO.setCommunityId(comActDO.getCommunityId());
+ comCorrectPopulationDO.setStreetId(comActDO.getStreetId());
+ comCorrectPopulationDAO.insert(comCorrectPopulationDO);
return populationDO;
}
private ComMngPopulationDO saveMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
- populationDO.setId(Snowflake.getId());
+ ComMajorPopulationDO comMajorPopulationDO = new ComMajorPopulationDO();
+ BeanUtils.copyProperties(vo, comMajorPopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comMajorPopulationDO.setPopulationId(populationId);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2730,13 +3129,21 @@
// }
// this.baseMapper.insert(populationDO);
+ comMajorPopulationDO.setId(Snowflake.getId());
+ comMajorPopulationDO.setCommunityId(comActDO.getCommunityId());
+ comMajorPopulationDO.setStreetId(comActDO.getStreetId());
+ comMajorPopulationDAO.insert(comMajorPopulationDO);
return populationDO;
}
private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
- populationDO.setId(Snowflake.getId());
+ ComCultPopulationDO comCultPopulationDO = new ComCultPopulationDO();
+ BeanUtils.copyProperties(vo, comCultPopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comCultPopulationDO.setPopulationId(populationId);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2762,13 +3169,21 @@
// }
// this.baseMapper.insert(populationDO);
+ comCultPopulationDO.setId(Snowflake.getId());
+ comCultPopulationDO.setCommunityId(comActDO.getCommunityId());
+ comCultPopulationDO.setStreetId(comActDO.getStreetId());
+ comCultPopulationDAO.insert(comCultPopulationDO);
return populationDO;
}
private ComMngPopulationDO saveRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
- populationDO.setId(Snowflake.getId());
+ ComRehabilitationPopulationDO comRehabilitationPopulationDO = new ComRehabilitationPopulationDO();
+ BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comRehabilitationPopulationDO.setPopulationId(populationId);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2794,13 +3209,21 @@
// }
// this.baseMapper.insert(populationDO);
+ comRehabilitationPopulationDO.setId(Snowflake.getId());
+ comRehabilitationPopulationDO.setCommunityId(comActDO.getCommunityId());
+ comRehabilitationPopulationDO.setStreetId(comActDO.getStreetId());
+ comRehabilitationPopulationDAO.insert(comRehabilitationPopulationDO);
return populationDO;
}
private ComMngPopulationDO saveKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
- populationDO.setId(Snowflake.getId());
+ ComKeyPopulationDO comKeyPopulationDO = new ComKeyPopulationDO();
+ BeanUtils.copyProperties(vo, comKeyPopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comKeyPopulationDO.setPopulationId(populationId);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2826,13 +3249,21 @@
// }
// this.baseMapper.insert(populationDO);
+ comKeyPopulationDO.setId(Snowflake.getId());
+ comKeyPopulationDO.setCommunityId(comActDO.getCommunityId());
+ comKeyPopulationDO.setStreetId(comActDO.getStreetId());
+ comKeyPopulationDAO.insert(comKeyPopulationDO);
return populationDO;
}
private ComMngPopulationDO saveSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
- populationDO.setId(Snowflake.getId());
+ ComSentencePopulationDO comSentencePopulationDO = new ComSentencePopulationDO();
+ BeanUtils.copyProperties(vo, comSentencePopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comSentencePopulationDO.setPopulationId(populationId);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2858,13 +3289,21 @@
// }
// this.baseMapper.insert(populationDO);
+ comSentencePopulationDO.setId(Snowflake.getId());
+ comSentencePopulationDO.setCommunityId(comActDO.getCommunityId());
+ comSentencePopulationDO.setStreetId(comActDO.getStreetId());
+ comSentencePopulationDAO.insert(comSentencePopulationDO);
return populationDO;
}
private ComMngPopulationDO saveVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
- populationDO.setId(Snowflake.getId());
+ ComVeteransPopulationDO comVeteransPopulationDO = new ComVeteransPopulationDO();
+ BeanUtils.copyProperties(vo, comVeteransPopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comVeteransPopulationDO.setPopulationId(populationId);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2890,13 +3329,21 @@
// }
// this.baseMapper.insert(populationDO);
+ comVeteransPopulationDO.setId(Snowflake.getId());
+ comVeteransPopulationDO.setCommunityId(comActDO.getCommunityId());
+ comVeteransPopulationDO.setStreetId(comActDO.getStreetId());
+ comVeteransPopulationDAO.insert(comVeteransPopulationDO);
return populationDO;
}
private ComMngPopulationDO saveDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
- populationDO.setId(Snowflake.getId());
+ ComDisabilityPopulationDO comDisabilityPopulationDO = new ComDisabilityPopulationDO();
+ BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comDisabilityPopulationDO.setPopulationId(populationId);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2922,6 +3369,50 @@
// }
// this.baseMapper.insert(populationDO);
+ comDisabilityPopulationDO.setId(Snowflake.getId());
+ comDisabilityPopulationDO.setCommunityId(comActDO.getCommunityId());
+ comDisabilityPopulationDO.setStreetId(comActDO.getStreetId());
+ comDisabilityPopulationDAO.insert(comDisabilityPopulationDO);
+ return populationDO;
+ }
+
+ private ComMngPopulationDO saveLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ ComMngPopulationDO populationDO = new ComMngPopulationDO();
+ ComLowSecurityPopulationDO comLowSecurityPopulationDO = new ComLowSecurityPopulationDO();
+ BeanUtils.copyProperties(vo, populationDO);
+ BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
+ Long populationId = Snowflake.getId();
+ populationDO.setId(populationId);
+ comLowSecurityPopulationDO.setPopulationId(populationId);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+
+ //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ populationDO.setVillageId(comMngVillageDO.getVillageId());
+ populationDO.setActId(comActDO.getCommunityId());
+ populationDO.setStreetId(comActDO.getStreetId());
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setVillageName(comMngVillageDO.getGroupAt());
+ populationDO.setCardNoStr(vo.getCardNo());
+ populationDO.setUpdateAt(new Date());
+ //新增的时候默认绑定房屋id
+// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
+// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
+// populationDO.setHouseId(vo.getHouseId());
+// }else{
+// populationDO.setHouseId(null);
+// }
+
+// this.baseMapper.insert(populationDO);
+ comLowSecurityPopulationDO.setId(Snowflake.getId());
+ comLowSecurityPopulationDO.setCommunityId(comActDO.getCommunityId());
+ comLowSecurityPopulationDO.setStreetId(comActDO.getStreetId());
+ comLowSecurityPopulationDAO.insert(comLowSecurityPopulationDO);
return populationDO;
}
@@ -3295,6 +3786,47 @@
}
private ComMngPopulationHouseDO saveDisabilityPopulationHouse(ComMngPopulationDisabilityExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
+ //查询该房屋未建立，执行建立房屋信息
+ ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
+ populationHouseDO.setId(Snowflake.getId());
+ populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
+ populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
+ populationHouseDO.setAlley(vo.getRoad());
+ populationHouseDO.setHouseNum(vo.getDoorNo());
+ populationHouseDO.setStatus(vo.getIsRent());
+ populationHouseDO.setCommunityId(communityId);
+ populationHouseDO.setFloor(vo.getFloor());
+ populationHouseDO.setUnitNo(vo.getUnitNo());
+ populationHouseDO.setHouseNo(vo.getHouseNo());
+ populationHouseDO.setCode(vo.getHouseNo());
+ populationHouseDO.setAddress(vo.getAddress());
+ populationHouseDO.setUpdateAt(new Date());
+// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ StringBuilder housePath = new StringBuilder();
+ housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ populationHouseDO.setPath(areaPath.toString() + housePath.toString());
+// try {
+// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+// } catch (Exception e) {
+// }
+
+ if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
+ populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
+ }
+ if (vo.getHouseStatus() != null) {
+ populationHouseDO.setStatus(vo.getHouseStatus());
+ }
+ if (vo.getHousePurpose() != null) {
+ populationHouseDO.setPurpose(vo.getHousePurpose());
+ }
+ if (vo.getControlStatus() != null) {
+ populationHouseDO.setControlStatus(vo.getControlStatus());
+ }
+// comMngPopulationHouseDAO.insert(populationHouseDO);
+ return populationHouseDO;
+ }
+
+ private ComMngPopulationHouseDO saveLowSecurityPopulationHouse(ComMngPopulationLowSecurityExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
//查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
@@ -4696,9 +5228,14 @@
mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
-// mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
+ mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
// mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
+ mvo.setIsCorrectGroup(PopulHouseUseEnum.getCnDescByName(vo.getIsCorrectGroup()));
+ mvo.setIsMissControl(PopulHouseUseEnum.getCnDescByName(vo.getIsMissControl()));
+ mvo.setIsAgainCrime(PopulHouseUseEnum.getCnDescByName(vo.getIsAgainCrime()));
+ mvo.setIsOutControl(PopulHouseUseEnum.getCnDescByName(vo.getIsOutControl()));
+ mvo.setIsRecidivist(PopulHouseUseEnum.getCnDescByName(vo.getIsRecidivist()));
// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
@@ -4707,7 +5244,7 @@
private void setMajorMistake(ComMngPopulationMajorMistakeExcelVO mvo, ComMngPopulationMajorExcelVO vo){
// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
- mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
+ mvo.setCustodyRelation(PopulRelationEnum.getCnDescByName(vo.getCustodyRelation()));
// mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
@@ -4715,6 +5252,7 @@
mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
// mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
+ mvo.setIsCrime(PopulHouseUseEnum.getCnDescByName(vo.getIsCrime()));
// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
@@ -4730,6 +5268,7 @@
mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
+ mvo.setIsExternalPublicity(PopulHouseUseEnum.getCnDescByName(vo.getIsExternalPublicity()));
// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
@@ -4746,6 +5285,8 @@
// mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
+ mvo.setIsRecidivist(PopulHouseUseEnum.getCnDescByName(vo.getIsRecidivist()));
+ mvo.setIsAgainCrime(PopulHouseUseEnum.getCnDescByName(vo.getIsAgainCrime()));
// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
@@ -4821,6 +5362,25 @@
// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
}
+ private void setLowSecurityMistake(ComMngPopulationLowSecurityMistakeExcelVO mvo, ComMngPopulationLowSecurityExcelVO vo){
+// mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
+// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
+// mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
+ mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
+ mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
+ mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
+// mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
+// mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
+ mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
+// mvo.setIsVeteransTraining(PopulHouseUseEnum.getCnDescByName(vo.getIsVeteransTraining()));
+// mvo.setIsBusiness(PopulHouseUseEnum.getCnDescByName(vo.getIsBusiness()));
+// mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
+// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
+// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
+// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ }
+
/**
* 判重方法
* @param key 主键
--
Gitblit v1.7.1