java/zhihuishenqu.git

			@@ -1,6 +1,19 @@
			package com.panzhihua.service_community.service.impl;

			import cn.hutool.core.util.IdcardUtil;
			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.util.*;
			import java.util.stream.Collectors;

			import javax.annotation.Resource;

			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;
			import org.springframework.util.ObjectUtils;

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			@@ -38,7 +51,6 @@
			import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
			import com.panzhihua.common.model.vos.screen.ComMngPopulationAgeVO;
			import com.panzhihua.common.model.vos.user.*;
			import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
			import com.panzhihua.common.utlis.AgeUtils;
			import com.panzhihua.common.utlis.DateUtils;
			import com.panzhihua.common.utlis.Snowflake;
			@@ -46,26 +58,17 @@
			import com.panzhihua.service_community.dao.*;
			import com.panzhihua.service_community.model.dos.*;
			import com.panzhihua.service_community.service.*;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;
			import org.springframework.util.ObjectUtils;

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.util.*;
			import java.util.stream.Collectors;
			import cn.hutool.core.util.IdcardUtil;
			import lombok.extern.slf4j.Slf4j;

			/**
			* 实有人口Service实现类
			*/
			@Slf4j
			@Service
			public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO> implements ComMngPopulationService {
			public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO>
			implements ComMngPopulationService {
			@Resource
			private ComMngPopulationDAO populationDAO;
			@Resource
			@@ -119,18 +122,18 @@
			@Value("${domain.aesKey:}")
			private String aesKey;



			/**
			* 新增实有人口
			*
			* @param comMngPopulationVO 新增信息
			* @param comMngPopulationVO
			* 新增信息
			* @return 新增结果
			*/
			@Override
			public R addPopulation(ComMngPopulationVO comMngPopulationVO) {
			ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
			Integer integer = populationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNo, comMngPopulationVO.getCardNo()));
			Integer integer = populationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda()
			.eq(ComMngPopulationDO::getCardNo, comMngPopulationVO.getCardNo()));
			if (integer > 0) {
			return R.fail("实有人口已经存在");
			}
			@@ -143,11 +146,11 @@
			return R.ok(nub);
			}


			/**
			* 编辑实有人口
			*
			* @param comMngPopulationVO 编辑内容
			* @param comMngPopulationVO
			* 编辑内容
			* @return 编辑结果
			*/
			@Override
			@@ -168,7 +171,8 @@
			/**
			* 查询实有人口
			*
			* @param comMngPopulationVO 查询条件
			* @param comMngPopulationVO
			* 查询条件
			* @return 实有人口集合
			*/
			@Override
			@@ -180,7 +184,8 @@
			/**
			* 实有人口详情
			*
			* @param populationId 实有人口id
			* @param populationId
			* 实有人口id
			* @return 实有人口详情
			*/
			@Override
			@@ -197,7 +202,8 @@
			BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);

			//查询户主关系信息
			// List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByUserId(comMngPopulationDO.getHouseId(),comMngPopulationDO.getId());
			// List<ComHouseMemberVo> comMngFamilyInfoVOS =
			// populationDAO.listHouseMermberByUserId(comMngPopulationDO.getHouseId(),comMngPopulationDO.getId());
			// if (!comMngFamilyInfoVOS.isEmpty()) {
			// comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
			// }
			@@ -210,28 +216,34 @@
			comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
			}
			//设置户主关系
			List<ComMngPopulationHouseUserDO> comMngPopulationHouseUserDOS = comMngPopulationHouseUserDAO.selectList((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
			List<ComMngPopulationHouseUserDO> comMngPopulationHouseUserDOS =
			comMngPopulationHouseUserDAO.selectList((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
			.eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
			if (!comMngPopulationHouseUserDOS.isEmpty()) {
			comMngPopulationVO.setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
			comMngPopulationVO
			.setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
			}
			//设置年龄
			if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
			comMngPopulationVO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationVO.getBirthday()));
			}
			//设置特殊群体标签
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = comMngPopulationCommunityTagsDAO.selectOne(new QueryWrapper<ComMngPopulationCommunityTagsDO>().
			lambda().eq(ComMngPopulationCommunityTagsDO::getPopulationId, populationId));
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
			comMngPopulationCommunityTagsDAO.selectOne(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda()
			.eq(ComMngPopulationCommunityTagsDO::getPopulationId, populationId));
			if (null != comMngPopulationCommunityTagsDO) {
			comMngPopulationVO.setLabel(comMngPopulationCommunityTagsDO.getLabel());
			}

			//查询当前用户电子档信息
			if (!StringUtils.isEmpty(comMngPopulationDO.getCardNo())) {
			UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
			UserElectronicFileVO electronicFileVO =
			populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
			if (electronicFileVO != null) {
			comMngPopulationVO.setUserElectronicFileVO(electronicFileVO);
			//查询家庭成员信息
			List<ComMngFamilyInfoVO> familyInfoVOList = populationDAO.listFamilyByUserId(electronicFileVO.getUserId());
			List<ComMngFamilyInfoVO> familyInfoVOList =
			populationDAO.listFamilyByUserId(electronicFileVO.getUserId());
			if (!familyInfoVOList.isEmpty()) {
			comMngPopulationVO.setFamilyInfoVOList(familyInfoVOList);
			}
			@@ -255,8 +267,8 @@

			//吸毒信息
			List<ComDrugPopulationVO> comDrugPopulationVOs = new ArrayList<>();
			List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(new QueryWrapper<ComDrugPopulationDO>().
			lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
			List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(
			new QueryWrapper<ComDrugPopulationDO>().lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
			if (!comDrugPopulationDOs.isEmpty()) {
			comDrugPopulationDOs.forEach(comDrugPopulationDO -> {
			ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
			@@ -268,8 +280,9 @@

			//社区矫正信息
			List<ComCorrectPopulationVO> comCorrectPopulationVOS = new ArrayList<>();
			List<ComCorrectPopulationDO> comCorrectPopulationDOS = comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().
			lambda().eq(ComCorrectPopulationDO::getPopulationId, populationId));
			List<ComCorrectPopulationDO> comCorrectPopulationDOS =
			comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().lambda()
			.eq(ComCorrectPopulationDO::getPopulationId, populationId));
			if (!comCorrectPopulationDOS.isEmpty()) {
			comCorrectPopulationDOS.forEach(comCorrectPopulationDO -> {
			ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
			@@ -281,8 +294,8 @@

			//精神障碍信息
			List<ComMajorPopulationVO> comMajorPopulationVOS = new ArrayList<>();
			List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(new QueryWrapper<ComMajorPopulationDO>().
			lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
			List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(
			new QueryWrapper<ComMajorPopulationDO>().lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
			if (!comMajorPopulationDOs.isEmpty()) {
			comMajorPopulationDOs.forEach(comMajorPopulationDO -> {
			ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
			@@ -294,8 +307,8 @@

			//邪教信息
			List<ComCultPopulationVO> comCultPopulationVOS = new ArrayList<>();
			List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(new QueryWrapper<ComCultPopulationDO>().
			lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
			List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(
			new QueryWrapper<ComCultPopulationDO>().lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
			if (!comCultPopulationDOS.isEmpty()) {
			comCultPopulationDOS.forEach(comCultPopulationDO -> {
			ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
			@@ -307,8 +320,9 @@

			//刑释信息
			List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOS = new ArrayList<>();
			List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS = comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().
			lambda().eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
			List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS =
			comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().lambda()
			.eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
			if (!comRehabilitationPopulationDOS.isEmpty()) {
			comRehabilitationPopulationDOS.forEach(comRehabilitationPopulationDO -> {
			ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
			@@ -320,8 +334,8 @@

			//上访信息
			List<ComKeyPopulationVO> comKeyPopulationVOS = new ArrayList<>();
			List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(new QueryWrapper<ComKeyPopulationDO>().
			lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
			List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(
			new QueryWrapper<ComKeyPopulationDO>().lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
			if (!comKeyPopulationDOS.isEmpty()) {
			comKeyPopulationDOS.forEach(comKeyPopulationDO -> {
			ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
			@@ -333,8 +347,9 @@

			//退役军人信息
			List<ComVeteransPopulationVO> comVeteransPopulationVOS = new ArrayList<>();
			List<ComVeteransPopulationDO> comVeteransPopulationDOS = comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().
			lambda().eq(ComVeteransPopulationDO::getPopulationId, populationId));
			List<ComVeteransPopulationDO> comVeteransPopulationDOS =
			comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().lambda()
			.eq(ComVeteransPopulationDO::getPopulationId, populationId));
			if (!comVeteransPopulationDOS.isEmpty()) {
			comVeteransPopulationDOS.forEach(comVeteransPopulationDO -> {
			ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
			@@ -346,8 +361,9 @@

			//残疾人信息
			List<ComDisabilityPopulationVO> comDisabilityPopulationVOS = new ArrayList<>();
			List<ComDisabilityPopulationDO> comDisabilityPopulationDOS = comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().
			lambda().eq(ComDisabilityPopulationDO::getPopulationId, populationId));
			List<ComDisabilityPopulationDO> comDisabilityPopulationDOS =
			comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().lambda()
			.eq(ComDisabilityPopulationDO::getPopulationId, populationId));
			if (!comDisabilityPopulationDOS.isEmpty()) {
			comDisabilityPopulationDOS.forEach(comDisabilityPopulationDO -> {
			ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
			@@ -359,8 +375,9 @@

			//低保户信息
			List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOS = new ArrayList<>();
			List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS = comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().
			lambda().eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
			List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS =
			comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().lambda()
			.eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
			if (!comLowSecurityPopulationDOS.isEmpty()) {
			comLowSecurityPopulationDOS.forEach(comLowSecurityPopulationDO -> {
			ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
			@@ -375,7 +392,8 @@
			/**
			* 分页查询社区
			*
			* @param comMngPopulationVO 查询参数
			* @param comMngPopulationVO
			* 查询参数
			* @return 分页集合
			*/
			@Override
			@@ -428,27 +446,32 @@
			}

			if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())) {
			String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");
			String ageStartTime = DateUtils.getDateFormatString(
			DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");
			if (StringUtils.isNotEmpty(ageStartTime)) {
			comMngPopulationVO.setAgeStartTime(ageStartTime);
			}
			}

			if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeEnd())) {
			String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()))), "yyyy-MM-dd");
			String ageEndTime = DateUtils.getDateFormatString(
			DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()))), "yyyy-MM-dd");
			if (StringUtils.isNotEmpty(ageEndTime)) {
			comMngPopulationVO.setAgeEndTime(ageEndTime);
			}
			}
			if (comMngPopulationVO.getAgeStartTime() !=null && !"".equals(comMngPopulationVO.getAgeStartTime()) && comMngPopulationVO.getAgeEndTime() !=null && !"".equals(comMngPopulationVO.getAgeEndTime())){
			if (comMngPopulationVO.getAgeStartTime() != null && !"".equals(comMngPopulationVO.getAgeStartTime())
			&& comMngPopulationVO.getAgeEndTime() != null && !"".equals(comMngPopulationVO.getAgeEndTime())) {
			if (comMngPopulationVO.getAgeStartTime().equals(comMngPopulationVO.getAgeEndTime())) {
			Date endAge = DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
			Date endAge =
			DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
			String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
			if (StringUtils.isNotEmpty(ageStartTime)) {
			comMngPopulationVO.setAgeStartTimeEnd(ageStartTime);
			}
			} else {
			Date endAge = DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
			Date endAge =
			DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
			String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
			if (StringUtils.isNotEmpty(ageStartTime)) {
			comMngPopulationVO.setAgeEndTimeEnd(ageStartTime);
			@@ -462,7 +485,8 @@
			populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
			populDO.setRelationName(PopulRelationEnum.getCnDescByName(populDO.getRelation()));
			populDO.setCultureLevelName(PopulCultureLevelEnum.getCnDescByName(populDO.getCultureLevel()));
			populDO.setPoliticalOutlookName(PopulPoliticalOutlookEnum.getCnDescByName(populDO.getPoliticalOutlook()));
			populDO.setPoliticalOutlookName(
			PopulPoliticalOutlookEnum.getCnDescByName(populDO.getPoliticalOutlook()));
			populDO.setMarriageName(PopulMarriageEnum.getCnDescByName(populDO.getMarriage()));
			}
			});
			@@ -473,7 +497,8 @@
			/**
			* 删除实有人口
			*
			* @param populationId 实有人口id
			* @param populationId
			* 实有人口id
			* @return 删除结果
			*/
			@Override
			@@ -492,7 +517,8 @@
			*/
			@Override
			public R listPopulationAll() {
			List<ComMngPopulationDO> populationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().orderByDesc(ComMngPopulationDO::getCreateAt));
			List<ComMngPopulationDO> populationDOS = populationDAO
			.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().orderByDesc(ComMngPopulationDO::getCreateAt));
			List<ComMngPopulationVO> populationVOS = new ArrayList<>();
			if (!ObjectUtils.isEmpty(populationDOS)) {
			populationDOS.forEach(comActDO -> {
			@@ -534,13 +560,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -555,7 +584,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -573,7 +603,8 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
			comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String,Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			@@ -615,8 +646,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -632,12 +664,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -646,7 +680,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO =
			savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -705,7 +740,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -719,8 +755,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -816,13 +854,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -837,7 +878,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -855,13 +897,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationDrugExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -898,8 +940,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -915,12 +958,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -929,7 +974,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveDrugPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveDrugPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -950,7 +996,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateDrugPopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateDrugPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -988,7 +1035,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -1002,8 +1050,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -1099,13 +1149,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -1120,7 +1173,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -1138,13 +1192,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationCorrectExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -1181,8 +1235,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -1198,12 +1253,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -1212,7 +1269,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveCorrectPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveCorrectPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -1233,7 +1291,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateCorrectPopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateCorrectPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -1271,7 +1330,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -1285,8 +1345,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -1382,13 +1444,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -1403,7 +1468,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -1421,13 +1487,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationMajorExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -1464,8 +1530,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -1481,12 +1548,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -1495,7 +1564,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveMajorPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveMajorPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -1516,7 +1586,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateMajorPopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateMajorPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -1554,7 +1625,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -1568,8 +1640,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -1665,13 +1739,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -1686,7 +1763,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -1704,13 +1782,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationCultExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -1747,8 +1825,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -1764,12 +1843,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -1778,7 +1859,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveCultPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveCultPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -1799,7 +1881,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateCultPopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateCultPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -1837,7 +1920,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -1851,8 +1935,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -1920,7 +2006,8 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId, Long userId) {
			public R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId,
			Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -1948,13 +2035,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -1969,7 +2059,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -1987,13 +2078,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationRehabilitationExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -2021,7 +2112,8 @@
			if(!isOnly(villageKey,villageMap)){
			comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
			}else{
			ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
			ComMngPopulationRehabilitationMistakeExcelVO mistake =
			new ComMngPopulationRehabilitationMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setRehabilitationMistake(mistake, vo);
			mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
			@@ -2030,8 +2122,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -2047,12 +2140,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -2061,7 +2156,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveRehabilitationPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveRehabilitationPopulationHouse(vo, comMngVillageDO, communityId,
			areaPath, populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -2082,7 +2178,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateRehabilitationPopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateRehabilitationPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -2120,7 +2217,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -2134,8 +2232,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -2147,7 +2247,8 @@
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
			ComMngPopulationRehabilitationMistakeExcelVO mistake =
			new ComMngPopulationRehabilitationMistakeExcelVO();
			BeanUtils.copyProperties(vo,mistake);
			setRehabilitationMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			@@ -2231,13 +2332,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -2252,7 +2356,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -2270,13 +2375,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationKeyExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -2313,8 +2418,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -2330,12 +2436,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -2344,7 +2452,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveKeyPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveKeyPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -2365,7 +2474,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateKeyPopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateKeyPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -2403,7 +2513,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -2417,8 +2528,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -2514,13 +2627,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -2535,7 +2651,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -2553,13 +2670,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationSentenceExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -2596,8 +2713,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -2613,12 +2731,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -2627,7 +2747,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveSentencePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveSentencePopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -2648,7 +2769,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateSentencePopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateSentencePopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -2686,7 +2808,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -2700,8 +2823,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -2797,13 +2922,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -2818,7 +2946,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -2836,13 +2965,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationVeteransExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -2879,8 +3008,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -2896,12 +3026,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -2910,7 +3042,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveVeteransPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveVeteransPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -2931,7 +3064,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateVeteransPopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateVeteransPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -2969,7 +3103,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -2983,8 +3118,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -3080,13 +3217,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -3101,7 +3241,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -3119,13 +3260,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationDisabilityExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -3162,8 +3303,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -3179,12 +3321,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -3193,7 +3337,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveDisabilityPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveDisabilityPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -3214,7 +3359,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateDisabilityPopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateDisabilityPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -3252,7 +3398,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -3266,8 +3413,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -3335,7 +3484,8 @@

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId, Long userId) {
			public R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId,
			Long userId) {
			//需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			//需要新增的人口集合
			@@ -3367,13 +3517,16 @@

			//查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			//处理实有人口信息
			Integer nub = 1;

			@@ -3388,7 +3541,8 @@
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String,Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key,house);
			});

			@@ -3406,13 +3560,13 @@
			houseUserMap.put(key,houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists = comMngPopulationCommunityTagsDAO.selectList(null);
			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 (ComMngPopulationLowSecurityExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			@@ -3449,8 +3603,9 @@
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
			.append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			@@ -3466,12 +3621,14 @@
			log.info("开始查询房屋是否存在");
			//先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if(isOnly(houseKey,houseMap)){
			if(!houseList.isEmpty()){
			for (ComMngPopulationHouseDO house:houseList) {
			if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
			&& house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())){
			populationHouseDO = house;
			break;
			@@ -3480,7 +3637,8 @@
			}
			if(populationHouseDO == null){
			//房屋信息不存在建立房屋信息
			populationHouseDO = saveLowSecurityPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
			populationHouseDO = saveLowSecurityPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			}else{
			@@ -3501,7 +3659,8 @@
			if(!isOnly(populationKey,populationMap)){
			//存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO = updateLowSecurityPopulationDO(vo,populationDO,communityId,userId);
			ComMngPopulationDO updatePopulationDO =
			updateLowSecurityPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			}else{
			//不存在实有人口,则新增
			@@ -3539,7 +3698,8 @@
			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());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			@@ -3553,8 +3713,10 @@
			}
			}else {
			//实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			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()) {
			@@ -3620,10 +3782,11 @@
			return R.ok(mistakes);
			}


			private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO, Long communityId, Long userId){
			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());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			// while (iterator.hasNext()) {
			@@ -3644,11 +3807,13 @@
			return populationDO;
			}

			private ComMngPopulationDO updateDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComMngPopulationDO populationDO, Long communityId, Long userId){
			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());
			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()) {
			@@ -3683,11 +3848,14 @@
			return populationDO;
			}

			private ComMngPopulationDO updateCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			private ComMngPopulationDO updateCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo,
			ComMngPopulationDO populationDO, Long communityId, Long userId) {
			BeanUtils.copyProperties(vo, populationDO);
			ComCorrectPopulationDO comCorrectPopulationDO = comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().lambda()
			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());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			// while (iterator.hasNext()) {
			@@ -3721,11 +3889,14 @@
			return populationDO;
			}

			private ComMngPopulationDO updateMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			private ComMngPopulationDO updateMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComMngPopulationDO populationDO,
			Long communityId, Long userId) {
			BeanUtils.copyProperties(vo, populationDO);
			ComMajorPopulationDO comMajorPopulationDO = comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().lambda()
			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());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			// while (iterator.hasNext()) {
			@@ -3759,11 +3930,13 @@
			return populationDO;
			}

			private ComMngPopulationDO updateCultPopulationDO(ComMngPopulationCultExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			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());
			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()) {
			@@ -3797,11 +3970,14 @@
			return populationDO;
			}

			private ComMngPopulationDO updateRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			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());
			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()) {
			@@ -3836,11 +4012,13 @@
			return populationDO;
			}

			private ComMngPopulationDO updateKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			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());
			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()) {
			@@ -3874,11 +4052,14 @@
			return populationDO;
			}

			private ComMngPopulationDO updateSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			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());
			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()) {
			@@ -3912,11 +4093,14 @@
			return populationDO;
			}

			private ComMngPopulationDO updateVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			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());
			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()) {
			@@ -3949,11 +4133,15 @@
			}
			return populationDO;
			}
			private ComMngPopulationDO updateDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){

			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());
			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()) {
			@@ -3987,11 +4175,14 @@
			return populationDO;
			}

			private ComMngPopulationDO updateLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComMngPopulationDO populationDO,Long communityId, Long userId){
			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());
			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()) {
			@@ -4025,11 +4216,13 @@
			return populationDO;
			}

			private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId) {
			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());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4066,7 +4259,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComPopulationActVO comActDO,
			ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComDrugPopulationDO comDrugPopulationDO = new ComDrugPopulationDO();
			@@ -4074,7 +4268,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comDrugPopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4115,7 +4310,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComPopulationActVO comActDO,
			ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComCorrectPopulationDO comCorrectPopulationDO = new ComCorrectPopulationDO();
			@@ -4123,7 +4319,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comCorrectPopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4164,7 +4361,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComPopulationActVO comActDO,
			ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComMajorPopulationDO comMajorPopulationDO = new ComMajorPopulationDO();
			@@ -4172,7 +4370,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comMajorPopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4213,7 +4412,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO,
			ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComCultPopulationDO comCultPopulationDO = new ComCultPopulationDO();
			@@ -4221,7 +4421,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comCultPopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4262,7 +4463,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo,
			ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComRehabilitationPopulationDO comRehabilitationPopulationDO = new ComRehabilitationPopulationDO();
			@@ -4270,7 +4472,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comRehabilitationPopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4311,7 +4514,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComPopulationActVO comActDO,
			ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComKeyPopulationDO comKeyPopulationDO = new ComKeyPopulationDO();
			@@ -4319,7 +4523,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comKeyPopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4360,7 +4565,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComPopulationActVO comActDO,
			ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComSentencePopulationDO comSentencePopulationDO = new ComSentencePopulationDO();
			@@ -4368,7 +4574,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comSentencePopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4409,7 +4616,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComPopulationActVO comActDO,
			ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComVeteransPopulationDO comVeteransPopulationDO = new ComVeteransPopulationDO();
			@@ -4417,7 +4625,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comVeteransPopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4458,7 +4667,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo,
			ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			ComDisabilityPopulationDO comDisabilityPopulationDO = new ComDisabilityPopulationDO();
			@@ -4466,7 +4676,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comDisabilityPopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4507,7 +4718,8 @@
			return populationDO;
			}

			private ComMngPopulationDO saveLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,Long userId) {
			private ComMngPopulationDO saveLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo,
			ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			ComLowSecurityPopulationDO comLowSecurityPopulationDO = new ComLowSecurityPopulationDO();
			BeanUtils.copyProperties(vo, populationDO);
			@@ -4515,7 +4727,8 @@
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comLowSecurityPopulationDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			@@ -4556,7 +4769,8 @@
			return populationDO;
			}

			private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4574,7 +4788,8 @@
			populationHouseDO.setUpdateAt(new Date());
			populationHouseDO.setConstructPurpose(vo.getBuildPurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			try {
			populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4597,7 +4812,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveDrugPopulationHouse(ComMngPopulationDrugExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveDrugPopulationHouse(ComMngPopulationDrugExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4615,7 +4831,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4638,7 +4855,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveCorrectPopulationHouse(ComMngPopulationCorrectExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveCorrectPopulationHouse(ComMngPopulationCorrectExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4656,7 +4874,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4679,7 +4898,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveMajorPopulationHouse(ComMngPopulationMajorExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveMajorPopulationHouse(ComMngPopulationMajorExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4697,7 +4917,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4720,7 +4941,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveCultPopulationHouse(ComMngPopulationCultExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveCultPopulationHouse(ComMngPopulationCultExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4738,7 +4960,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4761,7 +4984,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveRehabilitationPopulationHouse(ComMngPopulationRehabilitationExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveRehabilitationPopulationHouse(ComMngPopulationRehabilitationExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4779,7 +5003,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4802,7 +5027,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveKeyPopulationHouse(ComMngPopulationKeyExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveKeyPopulationHouse(ComMngPopulationKeyExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4820,7 +5046,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4843,7 +5070,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveSentencePopulationHouse(ComMngPopulationSentenceExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveSentencePopulationHouse(ComMngPopulationSentenceExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4861,7 +5089,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4884,7 +5113,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveVeteransPopulationHouse(ComMngPopulationVeteransExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveVeteransPopulationHouse(ComMngPopulationVeteransExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4902,7 +5132,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4925,7 +5156,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveDisabilityPopulationHouse(ComMngPopulationDisabilityExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveDisabilityPopulationHouse(ComMngPopulationDisabilityExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4943,7 +5175,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -4966,7 +5199,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveLowSecurityPopulationHouse(ComMngPopulationLowSecurityExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
			private ComMngPopulationHouseDO saveLowSecurityPopulationHouse(ComMngPopulationLowSecurityExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			@@ -4984,7 +5218,8 @@
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			@@ -5007,7 +5242,8 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo, ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
			private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo,
			ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
			//查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
			populationHouseUserDO.setId(Snowflake.getId());
			@@ -5023,8 +5259,10 @@
			/**
			* 确认导入实有人口（有则更新，无则新建）
			*
			* @param list 用户信息
			* @param communityId 社区id
			* @param list
			* 用户信息
			* @param communityId
			* 社区id
			* @return 导入结果
			*/
			@Override
			@@ -5032,16 +5270,21 @@
			if (list.size() == 0) {
			return R.fail("数据为空！");
			}
			List<ComMngPopulationDO> comMngPopulationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
			List<ComMngPopulationDO> comMngPopulationDOS = populationDAO
			.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
			//查询该社区所有(实有房屋)小区
			// List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
			// List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new
			// QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
			ComActDO comActDO = comActDAO.selectById(communityId);
			ArrayList<ComMngPopulationDO> populationDOList = Lists.newArrayList();
			list.forEach(vo -> {
			ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
			//查询街路巷是否存在
			ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
			// ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
			ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>()
			.eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
			// ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village ->
			// village.getAlley().equals(vo.getRoad()) &&
			// village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
			BeanUtils.copyProperties(vo, comMngPopulationDO);
			if (comMngVillageDO == null) {
			throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
			@@ -5049,7 +5292,8 @@
			comMngPopulationDO.setVillageId(comMngVillageDO.getVillageId());
			comMngPopulationDO.setActId(comActDO.getCommunityId());
			comMngPopulationDO.setStreetId(comActDO.getStreetId());
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			List<String> userTag =
			vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
			comMngPopulationDO.setLabel(Joiner.on(",").join(userTag));
			comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDOList.add(comMngPopulationDO);
			@@ -5063,7 +5307,8 @@
			String cardNo = AESUtil.encrypt128(population.getCardNo(), aesKey);
			population.setCardNo(cardNo);
			//查询这个用户是否存在
			ComMngPopulationDO comMngPopulationDO = this.populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
			ComMngPopulationDO comMngPopulationDO =
			this.populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
			.eq(ComMngPopulationDO::getCardNo, population.getCardNo()));
			if (comMngPopulationDO != null) {
			population.setId(comMngPopulationDO.getId());
			@@ -5093,7 +5338,8 @@
			/**
			* 根据id修改实有人口标签
			*
			* @param populationTagDTO 请求参数
			* @param populationTagDTO
			* 请求参数
			* @return 修改结果
			*/
			@Override
			@@ -5136,12 +5382,14 @@
			/**
			* 根据社区id查询所有实有人口
			*
			* @param communityId 社区id
			* @param communityId
			* 社区id
			* @return 查询结果
			*/
			@Override
			public R getPopulationListByCommunityId(Long communityId) {
			List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("act_id", communityId));
			List<ComMngPopulationDO> list =
			populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("act_id", communityId));
			List<ComMngPopulationVO> resultList = new ArrayList<>();
			if (list.size() > 0) {
			list.forEach(populationDO -> {
			@@ -5156,7 +5404,8 @@
			/**
			* 根据id集合查询实有人口
			*
			* @param Ids 实有人口id集合
			* @param Ids
			* 实有人口id集合
			* @return 查询结果
			*/
			@Override
			@@ -5175,7 +5424,8 @@

			@Override
			public R getPopulationListByVillageId(Long villageId) {
			List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("village_id", villageId));
			List<ComMngPopulationDO> list =
			populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("village_id", villageId));
			List<ComMngPopulationVO> resultList = new ArrayList<>();
			if (list.size() > 0) {
			list.forEach(populationDO -> {
			@@ -5224,7 +5474,6 @@
			});
			}


			//更新用户的房屋信息
			Long houseId = null;
			List<ComMngPopulationHouseUserDO> populationHouseUserDOList = new ArrayList<>();
			@@ -5257,8 +5506,9 @@
			populationDO.setFloor(houseDO.getFloor());
			populationDO.setUnitNo(houseDO.getUnitNo());
			populationDO.setHouseNo(houseDO.getHouseNo());
			ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().lambda()
			.eq(ComMngVillageDO::getAlley, houseDO.getAlley()).eq(ComMngVillageDO::getHouseNum, houseDO.getHouseNum())
			ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(
			new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getAlley, houseDO.getAlley())
			.eq(ComMngVillageDO::getHouseNum, houseDO.getHouseNum())
			.eq(ComMngVillageDO::getCommunityId, communityId));
			if (comMngVillageDO != null) {
			populationDO.setVillageId(comMngVillageDO.getVillageId());
			@@ -5269,7 +5519,8 @@
			}
			}

			// ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
			// ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new
			// QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
			// .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
			// if (comMngPopulationHouseUserDO != null) {
			// comMngPopulationHouseUserDO.setRelation(vo.getRelation());
			@@ -5291,15 +5542,16 @@

			@Override
			public R specialInputUser(PageInputUserDTO pageInputUserDTO) {
			IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(new Page<>(pageInputUserDTO.getPageNum()
			, pageInputUserDTO.getPageSize()), pageInputUserDTO);
			IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(
			new Page<>(pageInputUserDTO.getPageNum(), pageInputUserDTO.getPageSize()), pageInputUserDTO);
			return R.ok(iPage);
			}

			/**
			* 删除特殊群体人员
			*
			* @param id 特殊群体id
			* @param id
			* 特殊群体id
			* @return 删除结果
			*/
			@Override
			@@ -5319,8 +5571,8 @@

			@Override
			public R specialInputUserTags(PageInputUserDTO comMngUserTagDTO) {
			IPage<ComMngTagVO> iPage = populationDAO.specialInputUserTags(new Page<>(comMngUserTagDTO.getPageNum()
			, comMngUserTagDTO.getPageSize()), comMngUserTagDTO);
			IPage<ComMngTagVO> iPage = populationDAO.specialInputUserTags(
			new Page<>(comMngUserTagDTO.getPageNum(), comMngUserTagDTO.getPageSize()), comMngUserTagDTO);
			return R.ok(iPage);
			}

			@@ -5332,7 +5584,8 @@
			if (null == comMngUserTagDO) {
			return R.fail("该标签不存在");
			}
			ComMngUserTagDO checkCreditCode = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
			ComMngUserTagDO checkCreditCode = comMngUserTagDAO.selectOne(
			new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
			if (null != checkCreditCode && comMngUserTagDO.getId() != checkCreditCode.getId()) {
			return R.fail("该标签已存在，标签名称重复");
			}
			@@ -5344,7 +5597,8 @@
			}
			} else {
			//新增
			Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName())
			Integer count = comMngUserTagDAO.selectCount(
			new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName())
			.eq(ComMngUserTagDO::getCommunityId, comMngTagVO.getCommunityId()));
			if (count > 0) {
			return R.fail("该标签已存在，标签名称重复");
			@@ -5377,7 +5631,8 @@
			/**
			* 查询实有人口电子档信息
			*
			* @param populationId 实有人口id
			* @param populationId
			* 实有人口id
			* @return 实有人口电子档信息
			*/
			@Override
			@@ -5388,7 +5643,8 @@
			}
			//查询当前用户电子档信息
			if (!StringUtils.isEmpty(comMngPopulationDO.getCardNo())) {
			UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
			UserElectronicFileVO electronicFileVO =
			populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
			if (electronicFileVO != null) {
			return R.ok(electronicFileVO);
			}
			@@ -5409,7 +5665,8 @@
			/**
			* 实有人口统计
			*
			* @param communityId 社区id
			* @param communityId
			* 社区id
			* @return 统计结果
			*/
			@Override
			@@ -5426,7 +5683,8 @@
			ComMngPopulationDO comMngPopulation = new ComMngPopulationDO();
			if (comMngPopulationDO.getLabel() != null) {
			if (!comMngPopulationDO.getLabel().contains(comMngPopulationTagCardNoDTO.getLabel())) {
			comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel().concat(",").concat(comMngPopulationDO.getLabel()));
			comMngPopulation.setLabel(
			comMngPopulationTagCardNoDTO.getLabel().concat(",").concat(comMngPopulationDO.getLabel()));
			}
			} else {
			comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel());
			@@ -5444,10 +5702,7 @@
			public ComMngPopulationDO getPopulationByCardNo(String cardNo) {
			try {
			String aesCardNo = AESUtil.encrypt128(cardNo, aesKey);
			return baseMapper.selectOne(
			new QueryWrapper<ComMngPopulationDO>()
			.eq("card_no", aesCardNo)
			);
			return baseMapper.selectOne(new QueryWrapper<ComMngPopulationDO>().eq("card_no", aesCardNo));
			} catch (Exception e) {
			log.error("根据身份证查询业务-加密证件信息出错:{}", e.getCause());
			}
			@@ -5457,7 +5712,8 @@
			/**
			* 首页大屏统计接口
			*
			* @param communityId 社区id
			* @param communityId
			* 社区id
			* @return 统计结果
			*/
			@Override
			@@ -5472,7 +5728,8 @@
			//查询实有人口统计模块
			IndexPopulationStatisticsVO populationStatisticsVO = new IndexPopulationStatisticsVO();
			//查询实有人口性别统计
			List<IndexPopulationSexStatisticsVO> sexPopulationList = comMngPopulationDAO.getScreenIndexByPopulationSex(communityId);
			List<IndexPopulationSexStatisticsVO> sexPopulationList =
			comMngPopulationDAO.getScreenIndexByPopulationSex(communityId);
			populationStatisticsVO.setSexPopulationList(sexPopulationList);
			//查询实有人口年龄统计
			List<IndexPopulationAgeStatisticsVO> agePopulationList = statisticsAge(communityId);
			@@ -5480,12 +5737,14 @@
			statisticsVO.setPopulationStatisticsVO(populationStatisticsVO);

			//查询实有人口实时治理信息
			List<IndexEventListStatisticsVO> eventListStatisticsList = comMngPopulationDAO.getScreenIndexByEventList(communityId);
			List<IndexEventListStatisticsVO> eventListStatisticsList =
			comMngPopulationDAO.getScreenIndexByEventList(communityId);
			statisticsVO.setEventListStatisticsList(eventListStatisticsList);

			//查询社区治理动态信息
			IndexDynamicStatisticsVO dynamicStatisticsVO = comMngPopulationDAO.getScreenIndexByDynamic(communityId);
			dynamicStatisticsVO.setCultureActivityTotal(dynamicStatisticsVO.getPbTotal() + dynamicStatisticsVO.getActTotal());
			dynamicStatisticsVO
			.setCultureActivityTotal(dynamicStatisticsVO.getPbTotal() + dynamicStatisticsVO.getActTotal());
			statisticsVO.setDynamicStatisticsVO(dynamicStatisticsVO);

			//查询网格化治理
			@@ -5502,7 +5761,8 @@
			IndexGridStatisticsVO gridStatisticsVO = new IndexGridStatisticsVO();
			gridStatisticsVO.setEventData(gridData.getGridName());
			//根据网格id查询网格事件列表
			IndexGridEventStatisticsVO gridEventList = comMngPopulationDAO.getGridEventByGirdId(gridData.getId());
			IndexGridEventStatisticsVO gridEventList =
			comMngPopulationDAO.getGridEventByGirdId(gridData.getId());
			gridStatisticsVO.setGridEventStatisticsList(gridEventList);
			gridStatisticsList.add(gridStatisticsVO);
			}
			@@ -5617,7 +5877,8 @@
			/**
			* 事件大屏统计接口
			*
			* @param screenEventDTO 请求参数
			* @param screenEventDTO
			* 请求参数
			* @return 统计结果
			*/
			@Override
			@@ -5646,9 +5907,7 @@
			//查询事件资源文件
			List<EventResourceDO> eventResourceDOList =
			eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
			.eq(EventResourceDO::getClassification, 1)
			.eq(EventResourceDO::getRefId, newStatisticsVO.getId())
			);
			.eq(EventResourceDO::getClassification, 1).eq(EventResourceDO::getRefId, newStatisticsVO.getId()));
			List<EventResourceVO> picList = new ArrayList<>();
			List<EventResourceVO> audioList = new ArrayList<>();
			List<EventResourceVO> videoList = new ArrayList<>();
			@@ -5676,7 +5935,8 @@
			newStatisticsVO.setVideos(videoList);

			//查询事件流转记录
			List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(newStatisticsVO.getId());
			List<EventTransferRecordVO> transferRecordList =
			this.baseMapper.getEventScreenEventTransList(newStatisticsVO.getId());
			newStatisticsVO.setTransferRecordList(transferRecordList);
			}
			statisticsVO.setNewStatisticsVO(newStatisticsVO);
			@@ -5693,7 +5953,8 @@
			List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
			if(!villageStatisticsList.isEmpty()){
			villageStatisticsList.forEach(village -> {
			CivilVillageStatisticsVO villageStatisticsVO = this.baseMapper.getCivilScreenVillageStatistics(village.getVillageId());
			CivilVillageStatisticsVO villageStatisticsVO =
			this.baseMapper.getCivilScreenVillageStatistics(village.getVillageId());
			if(villageStatisticsVO != null){
			village.setPeopleNum(villageStatisticsVO.getPeopleNum());
			village.setHouseNum(villageStatisticsVO.getHouseNum());
			@@ -5718,7 +5979,8 @@
			/**
			* 民生大屏统计接口
			*
			* @param communityId 社区id
			* @param communityId
			* 社区id
			* @return 统计结果
			*/
			@Override
			@@ -5792,12 +6054,17 @@

			//计算环比上月增长率
			BigDecimal rate = BigDecimal.ZERO;
			CivilPopulationStatisticsVO populationStatisticsVO = this.baseMapper.getCivilScreenPopulation(communityId, DateUtils.getFirstDayOfMonth());
			CivilPopulationStatisticsVO populationStatisticsVO =
			this.baseMapper.getCivilScreenPopulation(communityId, DateUtils.getFirstDayOfMonth());
			if (populationStatisticsVO != null) {
			if (populationStatisticsVO.getToMonthSpecialTotal().equals(0)) {
			rate = BigDecimal.valueOf(100);
			} else {
			rate = BigDecimal.valueOf(populationStatisticsVO.getSpecialTotal() - populationStatisticsVO.getToMonthSpecialTotal()).divide(BigDecimal.valueOf(populationStatisticsVO.getToMonthSpecialTotal()), 3, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100));
			rate = BigDecimal
			.valueOf(populationStatisticsVO.getSpecialTotal() - populationStatisticsVO.getToMonthSpecialTotal())
			.divide(BigDecimal.valueOf(populationStatisticsVO.getToMonthSpecialTotal()), 3,
			BigDecimal.ROUND_HALF_UP)
			.multiply(BigDecimal.valueOf(100));
			}
			}
			civilStatisticsVO.setRate(rate);
			@@ -5892,7 +6159,9 @@
			Map<String, Long> sexMap = populationDAO.countBySex(communityId);
			comActPopulationScreenVO.setWoman(sexMap.get("woman") == null ? 0L : sexMap.get("woman"));
			comActPopulationScreenVO.setManNum(sexMap.get("man") == null ? 0L : sexMap.get("man"));
			int manPoint = (int) (((double) comActPopulationScreenVO.getManNum() / (double) comActPopulationScreenVO.getTotalNum()) * 100);
			int manPoint =
			(int)(((double)comActPopulationScreenVO.getManNum() / (double)comActPopulationScreenVO.getTotalNum())
			* 100);
			comActPopulationScreenVO.setManPoint(manPoint);
			comActPopulationScreenVO.setWomanPoint(100 - manPoint);

			@@ -5911,7 +6180,6 @@

			return R.ok(comActPopulationScreenVO);
			}


			private void setCultureGroup(ComActPopulationScreenVO comActPopulationScreenVO, Long communityId) {
			Map<String, Long> cultureMap = populationDAO.countByCulture(communityId);
			@@ -5998,7 +6266,8 @@
			/**
			* 获取社区网格
			*
			* @param communityId 社区id
			* @param communityId
			* 社区id
			* @return 网格数据
			*/
			@Override
			@@ -6009,7 +6278,8 @@
			/**
			* 事件大屏查询事件详情
			*
			* @param eventDetailDTO 请求参数
			* @param eventDetailDTO
			* 请求参数
			* @return 事件详情
			*/
			@Override
			@@ -6042,9 +6312,7 @@
			//查询事件资源文件
			List<EventResourceDO> eventResourceDOList =
			eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
			.eq(EventResourceDO::getClassification, 1)
			.eq(EventResourceDO::getRefId, statisticsVO.getId())
			);
			.eq(EventResourceDO::getClassification, 1).eq(EventResourceDO::getRefId, statisticsVO.getId()));
			List<EventResourceVO> picList = new ArrayList<>();
			List<EventResourceVO> audioList = new ArrayList<>();
			List<EventResourceVO> videoList = new ArrayList<>();
			@@ -6072,17 +6340,21 @@
			statisticsVO.setVideos(videoList);

			//查询事件流转记录
			List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(eventDetailDTO.getEventId());
			List<EventTransferRecordVO> transferRecordList =
			this.baseMapper.getEventScreenEventTransList(eventDetailDTO.getEventId());
			if(!transferRecordList.isEmpty()){
			transferRecordList.forEach(transfer -> {
			if(transfer.getFromType().equals(EventTransferRecordVO.fromType.wgy)){
			//查询上级网格信息
			EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetail(transfer.getEventId());
			transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
			+ transferRecordDetailVO.getCommunityName() + "-" + transferRecordDetailVO.getGridName());
			EventTransferRecordDetailVO transferRecordDetailVO =
			this.baseMapper.getEventScreenEventTransDetail(transfer.getEventId());
			transfer.setSuperiorRelationship(
			transferRecordDetailVO.getStreetName() + "-" + transferRecordDetailVO.getCommunityName()
			+ "-" + transferRecordDetailVO.getGridName());
			}else if(transfer.getFromType().equals(EventTransferRecordVO.fromType.sq)){
			//查询上级社区信息
			EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetailByCommunityId(transfer.getFromId());
			EventTransferRecordDetailVO transferRecordDetailVO =
			this.baseMapper.getEventScreenEventTransDetailByCommunityId(transfer.getFromId());
			transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
			+ transferRecordDetailVO.getCommunityName());
			}
			@@ -6097,12 +6369,14 @@
			/**
			* 获取人口数据信息
			*
			* @param populationListDTO 请求参数
			* @param populationListDTO
			* 请求参数
			* @return 人口数据
			*/
			@Override
			public R pagePopulationListApp(PagePopulationListDTO populationListDTO){
			IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
			IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp(
			new Page(populationListDTO.getPageNum(), populationListDTO.getPageSize()), populationListDTO);
			if(!pagePopulationList.getRecords().isEmpty()){
			pagePopulationList.getRecords().forEach(population -> {
			population.setAge(IdcardUtil.getAgeByIdCard(population.getCardNo()));
			@@ -6114,7 +6388,8 @@
			/**
			* 根据人口id获取人口详情
			*
			* @param populationId 人口id
			* @param populationId
			* 人口id
			* @return 人口详情
			*/
			@Override
			@@ -6123,7 +6398,8 @@
			if(detail != null){
			detail.setAge(IdcardUtil.getAgeByIdCard(detail.getCardNo()));
			if(StringUtils.isNotEmpty(detail.getCultureLevel())){
			detail.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(Integer.parseInt(detail.getCultureLevel())));
			detail
			.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(Integer.parseInt(detail.getCultureLevel())));
			}
			if(StringUtils.isNotEmpty(detail.getMarriage())){
			detail.setMarriage(PopulMarriageEnum.getCnDescByName(Integer.parseInt(detail.getMarriage())));
			@@ -6156,7 +6432,9 @@

			/**
			* 综治后台-居民列表
			* @param populationListDTO 请求参数
			*
			* @param populationListDTO
			* 请求参数
			* @return 居民列表
			*/
			@Override
			@@ -6169,7 +6447,8 @@
			}
			}

			IPage<ComMngPopulationListVO> populationListIPage = this.baseMapper.getGridPopulationAdminList(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
			IPage<ComMngPopulationListVO> populationListIPage = this.baseMapper.getGridPopulationAdminList(
			new Page(populationListDTO.getPageNum(), populationListDTO.getPageSize()), populationListDTO);
			if(!populationListIPage.getRecords().isEmpty()){
			populationListIPage.getRecords().forEach(population -> {
			try {
			@@ -6179,7 +6458,8 @@
			log.error("当前人口身份证获取年龄失败，实有人口id：" + population.getId());
			}
			//查询此用户在当前房屋是否是户主
			Integer relation = this.baseMapper.getPopulationRelationByHouseId(population.getHouseId(),population.getId());
			Integer relation =
			this.baseMapper.getPopulationRelationByHouseId(population.getHouseId(), population.getId());
			if(relation == null \|\| relation != 1){
			population.setIsRelation(2);
			}else{
			@@ -6192,7 +6472,9 @@

			/**
			* 综治后台-删除居民
			* @param ids 居民id集合
			*
			* @param ids
			* 居民id集合
			* @return 删除结果
			*/
			@Override
			@@ -6213,8 +6495,7 @@
			list.forEach(e->{
			QueryWrapper<ComMngPopulationHouseDO> houseQuery = new QueryWrapper<>();
			houseQuery.lambda().eq(ComMngPopulationHouseDO::getCommunityId,e.getActId())
			.eq(ComMngPopulationHouseDO::getAlley,e.getRoad())
			.eq(ComMngPopulationHouseDO::getFloor,e.getFloor())
			.eq(ComMngPopulationHouseDO::getAlley, e.getRoad()).eq(ComMngPopulationHouseDO::getFloor, e.getFloor())
			.eq(ComMngPopulationHouseDO::getUnitNo,e.getUnitNo())
			.eq(ComMngPopulationHouseDO::getHouseNo,e.getHouseNo());
			List<ComMngPopulationHouseDO> houseList = comMngPopulationHouseDAO.selectList(houseQuery);
			@@ -6231,13 +6512,16 @@

			/**
			* 查询平台人口列表
			* @param populationDTO 请求参数
			*
			* @param populationDTO
			* 请求参数
			* @return 人口列表
			*/
			@Override
			public R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO){

			IPage<EventSpecialPopulationVO> populationVOIPage = this.baseMapper.getBuildingHousePopulationList(new Page(populationDTO.getPageNum(),populationDTO.getPageSize()),populationDTO);
			IPage<EventSpecialPopulationVO> populationVOIPage = this.baseMapper.getBuildingHousePopulationList(
			new Page(populationDTO.getPageNum(), populationDTO.getPageSize()), populationDTO);
			if(!populationVOIPage.getRecords().isEmpty()){
			populationVOIPage.getRecords().forEach(population -> {
			try {
			@@ -6253,6 +6537,7 @@

			/**
			* 综治后台-居民标签栏统计
			*
			* @return 居民统计
			*/
			@Override
			@@ -6262,7 +6547,9 @@

			/**
			* 综治后台-居民导出查询居民数据
			* @param populationExportDTO 请求参数
			*
			* @param populationExportDTO
			* 请求参数
			* @return 导出结果
			*/
			@Override
			@@ -6270,7 +6557,8 @@
			//结果集
			List<ComMngPopulationExportExcelVO> resultPopulationList = new ArrayList<>();
			//查询人口信息
			List<ComMngPopulationListVO> populationListVOList = this.baseMapper.getGridPopulationAdminLists(populationExportDTO);
			List<ComMngPopulationListVO> populationListVOList =
			this.baseMapper.getGridPopulationAdminLists(populationExportDTO);
			if(!populationListVOList.isEmpty()){
			populationListVOList.forEach(population -> {
			ComMngPopulationExportExcelVO populationExportExcelVO = new ComMngPopulationExportExcelVO();
			@@ -6279,7 +6567,8 @@
			populationExportExcelVO.setSex(PopulSexEnum.getCnDescByName(population.getSex()));
			}
			if(population.getPoliticalOutlook() != null){
			populationExportExcelVO.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(population.getPoliticalOutlook()));
			populationExportExcelVO.setPoliticalOutlook(
			PopulPoliticalOutlookEnum.getCnDescByName(population.getPoliticalOutlook()));
			}
			if(population.getIsHouse() != null){
			if(!population.getIsHouse().equals(0L)){
			@@ -6289,7 +6578,8 @@
			}
			}
			if(population.getEventStatus() != null){
			populationExportExcelVO.setEventStatus(EventStatusEnum.getCnDescByName(population.getEventStatus()));
			populationExportExcelVO
			.setEventStatus(EventStatusEnum.getCnDescByName(population.getEventStatus()));
			}
			try {
			Integer age = IdcardUtil.getAgeByIdCard(population.getCardNo());
			@@ -6305,7 +6595,9 @@

			/**
			* 综治后台-居民管理小区列表
			* @param name 小区名字
			*
			* @param name
			* 小区名字
			* @return 小区列表
			*/
			@Override
			@@ -6329,7 +6621,8 @@

			@Override
			public R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO){
			return R.ok(this.baseMapper.getVillagePopulationAdmin(new Page(villagePopulationDTO.getPageNum(),villagePopulationDTO.getPageSize()),villagePopulationDTO));
			return R.ok(this.baseMapper.getVillagePopulationAdmin(
			new Page(villagePopulationDTO.getPageNum(), villagePopulationDTO.getPageSize()), villagePopulationDTO));
			}

			private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo){
			@@ -6415,7 +6708,8 @@
			// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
			}

			private void setRehabilitationMistake(ComMngPopulationRehabilitationMistakeExcelVO mvo, ComMngPopulationRehabilitationExcelVO vo){
			private void setRehabilitationMistake(ComMngPopulationRehabilitationMistakeExcelVO mvo,
			ComMngPopulationRehabilitationExcelVO vo) {
			// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
			mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
			@@ -6484,7 +6778,8 @@
			// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
			}

			private void setDisabilityMistake(ComMngPopulationDisabilityMistakeExcelVO mvo, ComMngPopulationDisabilityExcelVO vo){
			private void setDisabilityMistake(ComMngPopulationDisabilityMistakeExcelVO mvo,
			ComMngPopulationDisabilityExcelVO vo) {
			// mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
			// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
			@@ -6503,7 +6798,8 @@
			// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
			}

			private void setLowSecurityMistake(ComMngPopulationLowSecurityMistakeExcelVO mvo, ComMngPopulationLowSecurityExcelVO vo){
			private void setLowSecurityMistake(ComMngPopulationLowSecurityMistakeExcelVO mvo,
			ComMngPopulationLowSecurityExcelVO vo) {
			// mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
			// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
			@@ -6524,8 +6820,11 @@

			/**
			* 判重方法
			* @param key 主键
			* @param hashMap 数据集
			*
			* @param key
			* 主键
			* @param hashMap
			* 数据集
			* @return 存在即为false 不存在则为true
			*/
			private boolean isOnly(String key,HashMap<String,Object> hashMap){