java/zhihuishenqu.git

			@@ -396,7 +396,7 @@
			ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
			if (comMngVillageDO == null) {
			ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
			importErrorVO.setErrorMsg("街路巷或小区号不存在");
			importErrorVO.setErrorMsg("街路巷或小区号不存在，请先在“小区管理”中添加该小区");
			importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
			populationImportErrorVOList.add(importErrorVO);
			// index++;
			@@ -454,6 +454,7 @@
			populationHouseUserDO.setPopulId(populationDO.getId());
			populationHouseUserDO.setRelation(vo.getRelation());
			populationHouseUserDO.setRelationId(vo.getIsRent());
			populationHouseUserDO.setResidence(vo.getResidence());
			comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
			}
			}
			@@ -814,6 +815,9 @@
			populationHouseUserDO.setRelation(houseEditDto.getRelation());
			if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) {
			houseId = houseEditDto.getId();//居住地
			populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.yes);
			}else {
			populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.no);
			}
			populationHouseUserDOList.add(populationHouseUserDO);

			@@ -1268,7 +1272,11 @@
			villageStatisticsList.forEach(village -> {
			CivilVillageStatisticsVO villageStatisticsVO = this.baseMapper.getCivilScreenVillageStatistics(village.getVillageId());
			if(villageStatisticsVO != null){
			BeanUtils.copyProperties(villageStatisticsVO,village);
			village.setPeopleNum(villageStatisticsVO.getPeopleNum());
			village.setHouseNum(villageStatisticsVO.getHouseNum());
			village.setRegisterNum(villageStatisticsVO.getRegisterNum());
			village.setFlowNum(villageStatisticsVO.getFlowNum());
			// BeanUtils.copyProperties(villageStatisticsVO,village);
			}
			});
			}