| | |
|---|
| | | log.info("查询小区街路巷是否存在完成"); |
|---|
| | | |
|---|
| | | log.info("开始查询房屋是否存在"); |
|---|
| | | // 先判断房屋是否存在 |
|---|
| | | ComMngPopulationHouseDO populationHouseDO = null; |
|---|
| | | String houseKey = |
|---|
| | | communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo(); |
|---|
| | | if (isOnly(houseKey, houseMap)) { |
|---|
| | | if (!houseList.isEmpty()) { |
|---|
| | | for (ComMngPopulationHouseDO house : houseList) { |
|---|
| | | if (house.getVillageId().equals(comMngVillageDO.getVillageId()) |
|---|
| | | && house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor()) |
|---|
| | | && house.getUnitNo().equals(vo.getUnitNo()) |
|---|
| | | && house.getHouseNo().equals(vo.getHouseNo())) { |
|---|
| | | populationHouseDO = house; |
|---|
| | | break; |
|---|
| | | // 先判断房屋是否存在 |
|---|
| | | if(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){ |
|---|
| | | String houseKey = |
|---|
| | | communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo(); |
|---|
| | | if (isOnly(houseKey, houseMap)) { |
|---|
| | | if (!houseList.isEmpty()) { |
|---|
| | | for (ComMngPopulationHouseDO house : houseList) { |
|---|
| | | if (house.getVillageId().equals(comMngVillageDO.getVillageId()) |
|---|
| | | && house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor()) |
|---|
| | | && house.getUnitNo().equals(vo.getUnitNo()) |
|---|
| | | && house.getHouseNo().equals(vo.getHouseNo())) { |
|---|
| | | populationHouseDO = house; |
|---|
| | | break; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (populationHouseDO == null) { |
|---|
| | | // 房屋信息不存在建立房屋信息 |
|---|
| | | populationHouseDO = |
|---|
| | | savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName()); |
|---|
| | | houseList.add(populationHouseDO); |
|---|
| | | } |
|---|
| | | } else { |
|---|
| | | populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey); |
|---|
| | | } |
|---|
| | | if (populationHouseDO == null) { |
|---|
| | | // 房屋信息不存在建立房屋信息 |
|---|
| | | populationHouseDO = |
|---|
| | | savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName()); |
|---|
| | | houseList.add(populationHouseDO); |
|---|
| | | } |
|---|
| | | } else { |
|---|
| | | populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey); |
|---|
| | | vo.setHouseId(populationHouseDO.getId()); |
|---|
| | | log.info("查询房屋是否存在完成"); |
|---|
| | | }else { |
|---|
| | | ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO(); |
|---|
| | | BeanUtils.copyProperties(vo, mistake); |
|---|
| | | setMistake(mistake, vo); |
|---|
| | | mistake.setMistake("房屋数据填报不完整" ); |
|---|
| | | mistakes.add(mistake); |
|---|
| | | log.info("房屋数据填报不完整"); |
|---|
| | | continue; |
|---|
| | | } |
|---|
| | | vo.setHouseId(populationHouseDO.getId()); |
|---|
| | | log.info("查询房屋是否存在完成"); |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) { |
|---|
| | | // 空户处理完房屋信息，直接返回 |
|---|
