java/zhihuishenqu.git

			@@ -81,6 +81,10 @@
			@Resource
			private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
			@Resource
			private ComMngPopulationCommunityTagsDAO comMngPopulationCommunityTagsDAO;
			@Resource
			private ComMngPopulationCommunityTagsService comMngPopulationCommunityTagsService;
			@Resource
			private ComMngPopulationDAO comMngPopulationDAO;
			@Resource
			private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
			@@ -213,6 +217,12 @@
			//设置年龄
			if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
			comMngPopulationVO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationVO.getBirthday()));
			}
			//设置特殊群体标签
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = comMngPopulationCommunityTagsDAO.selectOne(new QueryWrapper<ComMngPopulationCommunityTagsDO>().
			lambda().eq(ComMngPopulationCommunityTagsDO::getPopulationId, populationId));
			if (null != comMngPopulationCommunityTagsDO) {
			comMngPopulationVO.setLabel(comMngPopulationCommunityTagsDO.getLabel());
			}

			//查询当前用户电子档信息
			@@ -496,7 +506,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId){
			public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId, Long userId){
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -505,6 +515,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -516,7 +530,7 @@
			log.error("未查询到社区信息");
			return R.fail("未查询到社区信息");
			}
			log.info("开始查询社区信息数据完成");
			log.info("查询社区信息数据完成");

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			@@ -559,6 +573,12 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});

			for (ComMngPopulationServeExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -607,7 +627,7 @@
			address.append(vo.getHouseNo()).append("号");
			}
			vo.setAddress(address.toString());
			log.info("开始查询小区街路巷是否存在完成");
			log.info("查询小区街路巷是否存在完成");

			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			@@ -633,7 +653,7 @@
			populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
			}
			vo.setHouseId(populationHouseDO.getId());
			log.info("开始查询房屋是否存在完成");
			log.info("查询房屋是否存在完成");

			if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
			//空户处理完房屋信息，直接返回
			@@ -647,20 +667,14 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updatePopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updatePopulationDO(vo,populationDO,communityId,userId);
			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);
			populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			log.info("查询实有人口是否已存在完成");

			log.info("开始查询实有人口房屋居住信息");
			//处理实有人口房屋居住信息
			@@ -678,7 +692,53 @@
			houseUserList.add(populationHouseUserDO);
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");
			log.info("查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -689,23 +749,33 @@
			if(!houseList.isEmpty()){
			log.info("执行数据库导入房屋");
			comMngPopulationHouseDAO.insertAll(houseList);
			log.info("执行数据库导入房屋完成");
			log.info("数据库导入房屋完成");
			}
			if(!saveList.isEmpty()){
			log.info("执行数据库导入人口");
			this.baseMapper.insertAll(saveList);
			log.info("执行数据库导入人口完成");
			log.info("数据库导入人口完成");
			}
			if(!updateList.isEmpty()){
			log.info("执行数据库更新人口");
			this.baseMapper.updateAll(updateList);
			// this.updateBatchById(updateList);
			log.info("执行数据库更新人口完成");
			log.info("数据库更新人口完成");
			}
			if(!houseUserList.isEmpty()){
			log.info("执行数据库导入人口房屋关系");
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			log.info("数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			@@ -718,7 +788,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveDrugPopulation(List<ComMngPopulationDrugExcelVO> list, Long communityId) {
			public R listSaveDrugPopulation(List<ComMngPopulationDrugExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -727,6 +797,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationDrugMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -779,6 +853,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -869,11 +950,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateDrugPopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateDrugPopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveDrugPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveDrugPopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -895,6 +976,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setDrugMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -923,6 +1050,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -934,7 +1071,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveCorrectPopulation(List<ComMngPopulationCorrectExcelVO> list, Long communityId) {
			public R listSaveCorrectPopulation(List<ComMngPopulationCorrectExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -943,6 +1080,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationCorrectMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -995,6 +1136,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -1085,11 +1233,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateCorrectPopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateCorrectPopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveCorrectPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveCorrectPopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -1111,6 +1259,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setCorrectMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -1139,6 +1333,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -1150,7 +1354,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId) {
			public R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -1159,6 +1363,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationMajorMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -1211,6 +1419,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -1301,11 +1516,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateMajorPopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateMajorPopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveMajorPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveMajorPopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -1327,6 +1542,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setMajorMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -1355,6 +1616,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -1366,7 +1637,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId) {
			public R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -1375,6 +1646,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationCultMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -1427,6 +1702,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -1517,11 +1799,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateCultPopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateCultPopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveCultPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveCultPopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -1543,6 +1825,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setCultMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -1571,6 +1899,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -1582,7 +1920,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId) {
			public R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -1591,6 +1929,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationRehabilitationMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -1643,6 +1985,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -1733,11 +2082,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateRehabilitationPopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateRehabilitationPopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveRehabilitationPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveRehabilitationPopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -1759,6 +2108,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setRehabilitationMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -1787,6 +2182,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -1798,7 +2203,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId) {
			public R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -1807,6 +2212,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationKeyMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -1859,6 +2268,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -1949,11 +2365,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateKeyPopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateKeyPopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveKeyPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveKeyPopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -1975,6 +2391,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setKeyMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -2003,6 +2465,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -2014,7 +2486,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveSentencePopulation(List<ComMngPopulationSentenceExcelVO> list, Long communityId) {
			public R listSaveSentencePopulation(List<ComMngPopulationSentenceExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -2023,6 +2495,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationSentenceMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -2075,6 +2551,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -2165,11 +2648,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateSentencePopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateSentencePopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveSentencePopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveSentencePopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -2191,6 +2674,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setSentenceMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -2219,6 +2748,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -2230,7 +2769,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveVeteransPopulation(List<ComMngPopulationVeteransExcelVO> list, Long communityId) {
			public R listSaveVeteransPopulation(List<ComMngPopulationVeteransExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -2239,6 +2778,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationVeteransMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -2291,6 +2834,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -2381,11 +2931,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateVeteransPopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateVeteransPopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveVeteransPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveVeteransPopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -2407,6 +2957,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setVeteransMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -2435,6 +3031,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -2446,7 +3052,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveDisabilityPopulation(List<ComMngPopulationDisabilityExcelVO> list, Long communityId) {
			public R listSaveDisabilityPopulation(List<ComMngPopulationDisabilityExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -2455,6 +3061,10 @@
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationDisabilityMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -2507,6 +3117,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -2597,11 +3214,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateDisabilityPopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateDisabilityPopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveDisabilityPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveDisabilityPopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -2623,6 +3240,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setDisabilityMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -2651,6 +3314,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -2662,7 +3335,7 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId) {
			public R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId, Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -2675,6 +3348,10 @@
			List<ComDrugPopulationDO> updateDrugList = new ArrayList<>();
			//需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			//需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationLowSecurityMistakeExcelVO> mistakes = new ArrayList<>();
			@@ -2727,6 +3404,13 @@
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key,populationCommunity);
			});


			@@ -2817,11 +3501,11 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateLowSecurityPopulationDO(vo,populationDO,labelList);
			ComMngPopulationDO updatePopulationDO = updateLowSecurityPopulationDO(vo,populationDO,communityId,userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			populationDO = saveLowSecurityPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
			populationDO = saveLowSecurityPopulationDO(vo, populationActVO, comMngVillageDO,userId);
			saveList.add(populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");
			@@ -2843,6 +3527,52 @@
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			//处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if(isOnly(populationCommunityKey,populationCommunityMap)){
			//实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			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();
			}
			comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setLowSecurityMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			log.info("查询实有人口存在社区信息完成");
			}
			}catch (Exception e){
			log.info("出现错误，错误原因：" + e.getMessage());
			@@ -2871,6 +3601,16 @@
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if(!savePopulationCommunityList.isEmpty()){
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if(!updatePopulationCommunityList.isEmpty()){
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			@@ -2881,47 +3621,51 @@
			}


			private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO, Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			return populationDO;
			}

			private ComMngPopulationDO updateDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComMngPopulationDO populationDO, Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectOne(new QueryWrapper<ComDrugPopulationDO>().lambda()
			.eq(ComDrugPopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);

			if (comDrugPopulationDO != null) {
			BeanUtils.copyProperties(vo, comDrugPopulationDO);
			@@ -2939,26 +3683,28 @@
			return populationDO;
			}

			private ComMngPopulationDO updateCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComCorrectPopulationDO comCorrectPopulationDO = comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().lambda()
			.eq(ComCorrectPopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comCorrectPopulationDO != null) {
			BeanUtils.copyProperties(vo, comCorrectPopulationDO);
			comCorrectPopulationDO.setCardNo(cardNoAES);
			@@ -2975,26 +3721,28 @@
			return populationDO;
			}

			private ComMngPopulationDO updateMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComMajorPopulationDO comMajorPopulationDO = comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().lambda()
			.eq(ComMajorPopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comMajorPopulationDO != null) {
			BeanUtils.copyProperties(vo, comMajorPopulationDO);
			comMajorPopulationDO.setCardNo(cardNoAES);
			@@ -3011,26 +3759,28 @@
			return populationDO;
			}

			private ComMngPopulationDO updateCultPopulationDO(ComMngPopulationCultExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateCultPopulationDO(ComMngPopulationCultExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectOne(new QueryWrapper<ComCultPopulationDO>().lambda().
			eq(ComCultPopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comCultPopulationDO != null) {
			BeanUtils.copyProperties(vo, comCultPopulationDO);
			comCultPopulationDO.setCardNo(cardNoAES);
			@@ -3047,26 +3797,28 @@
			return populationDO;
			}

			private ComMngPopulationDO updateRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComRehabilitationPopulationDO comRehabilitationPopulationDO = comRehabilitationPopulationDAO.selectOne(new QueryWrapper<ComRehabilitationPopulationDO>().lambda().
			eq(ComRehabilitationPopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comRehabilitationPopulationDO != null) {
			BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
			comRehabilitationPopulationDO.setCardNo(cardNoAES);
			@@ -3084,26 +3836,28 @@
			return populationDO;
			}

			private ComMngPopulationDO updateKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>().lambda().
			eq(ComKeyPopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comKeyPopulationDO != null) {
			BeanUtils.copyProperties(vo, comKeyPopulationDO);
			comKeyPopulationDO.setCardNo(cardNoAES);
			@@ -3120,26 +3874,28 @@
			return populationDO;
			}

			private ComMngPopulationDO updateSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComSentencePopulationDO comSentencePopulationDO = comSentencePopulationDAO.selectOne(new QueryWrapper<ComSentencePopulationDO>().lambda().
			eq(ComSentencePopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comSentencePopulationDO != null) {
			BeanUtils.copyProperties(vo, comSentencePopulationDO);
			comSentencePopulationDO.setCardNo(cardNoAES);
			@@ -3156,26 +3912,28 @@
			return populationDO;
			}

			private ComMngPopulationDO updateVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComVeteransPopulationDO comVeteransPopulationDO = comVeteransPopulationDAO.selectOne(new QueryWrapper<ComVeteransPopulationDO>().lambda().
			eq(ComVeteransPopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comVeteransPopulationDO != null) {
			BeanUtils.copyProperties(vo, comVeteransPopulationDO);
			comVeteransPopulationDO.setCardNo(cardNoAES);
			@@ -3191,26 +3949,28 @@
			}
			return populationDO;
			}
			private ComMngPopulationDO updateDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComDisabilityPopulationDO comDisabilityPopulationDO = comDisabilityPopulationDAO.selectOne(new QueryWrapper<ComDisabilityPopulationDO>().lambda().
			eq(ComDisabilityPopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comDisabilityPopulationDO != null) {
			BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
			comDisabilityPopulationDO.setCardNo(cardNoAES);
			@@ -3227,26 +3987,28 @@
			return populationDO;
			}

			private ComMngPopulationDO updateLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
			private ComMngPopulationDO updateLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			BeanUtils.copyProperties(vo, populationDO);
			ComLowSecurityPopulationDO comLowSecurityPopulationDO = comLowSecurityPopulationDAO.selectOne(new QueryWrapper<ComLowSecurityPopulationDO>().lambda().
			eq(ComLowSecurityPopulationDO::getPopulationId, populationDO.getId()));
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comLowSecurityPopulationDO != null) {
			BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
			comLowSecurityPopulationDO.setCardNo(cardNoAES);
			@@ -3263,23 +4025,23 @@
			return populationDO;
			}

			private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			populationDO.setId(Snowflake.getId());
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3291,6 +4053,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3303,7 +4066,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComDrugPopulationDO comDrugPopulationDO = new ComDrugPopulationDO();
			@@ -3311,19 +4074,19 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comDrugPopulationDO.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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3335,6 +4098,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3351,7 +4115,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComCorrectPopulationDO comCorrectPopulationDO = new ComCorrectPopulationDO();
			@@ -3359,19 +4123,19 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comCorrectPopulationDO.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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3383,6 +4147,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3399,7 +4164,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComMajorPopulationDO comMajorPopulationDO = new ComMajorPopulationDO();
			@@ -3407,19 +4172,19 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comMajorPopulationDO.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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3431,6 +4196,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3447,7 +4213,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComCultPopulationDO comCultPopulationDO = new ComCultPopulationDO();
			@@ -3455,19 +4221,19 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comCultPopulationDO.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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3479,6 +4245,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3495,7 +4262,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComRehabilitationPopulationDO comRehabilitationPopulationDO = new ComRehabilitationPopulationDO();
			@@ -3503,19 +4270,19 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comRehabilitationPopulationDO.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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3527,6 +4294,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3543,7 +4311,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComKeyPopulationDO comKeyPopulationDO = new ComKeyPopulationDO();
			@@ -3551,19 +4319,19 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comKeyPopulationDO.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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3575,6 +4343,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3591,7 +4360,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComSentencePopulationDO comSentencePopulationDO = new ComSentencePopulationDO();
			@@ -3599,19 +4368,19 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comSentencePopulationDO.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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3623,6 +4392,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3639,7 +4409,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComVeteransPopulationDO comVeteransPopulationDO = new ComVeteransPopulationDO();
			@@ -3647,19 +4417,19 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comVeteransPopulationDO.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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3671,6 +4441,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3687,7 +4458,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComDisabilityPopulationDO comDisabilityPopulationDO = new ComDisabilityPopulationDO();
			@@ -3695,19 +4466,19 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comDisabilityPopulationDO.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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3719,6 +4490,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			@@ -3735,7 +4507,7 @@
			return populationDO;
			}

			private ComMngPopulationDO saveLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
			private ComMngPopulationDO saveLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			ComLowSecurityPopulationDO comLowSecurityPopulationDO = new ComLowSecurityPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			@@ -3743,19 +4515,19 @@
			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();
			}
			// 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.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			@@ -3767,6 +4539,7 @@
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			//新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {