修改bug

huanghongfa

2021-05-28 9266a35a4a70ed2738b3d3e33cd18cf37187b1bb

修改bug

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -262,6 +262,7 @@
        int index = 2;
        //处理实有人口信息
        List<ComMngPopulationDO> savePopulList = new ArrayList<>();
        List<ComMngPopulationHouseDO> saveHouseList = new ArrayList<>();
        for (ComMngPopulationServeExcelVO vo : list) {
            String address = "";
            //查询街路巷是否存在
@@ -286,27 +287,40 @@
                    .eq(ComMngPopulationHouseDO::getFloor,vo.getFloor()).eq(ComMngPopulationHouseDO::getUnitNo,vo.getUnitNo())
                    .eq(ComMngPopulationHouseDO::getHouseNo,vo.getHouseNo()));
            if(populationHouseDO == null){
                //查询该房屋未建立，执行建立房屋信息
                populationHouseDO = new ComMngPopulationHouseDO();
                populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
                populationHouseDO.setCommunityId(communityId);
                populationHouseDO.setFloor(vo.getFloor());
                populationHouseDO.setUnitNo(vo.getUnitNo());
                populationHouseDO.setHouseNo(vo.getHouseNo());
                populationHouseDO.setAddress(address);
                if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
                    populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
                boolean isExits = true;
                for (ComMngPopulationHouseDO saveHouse:saveHouseList){
                    if(saveHouse.getAlley().equals(vo.getRoad()) && saveHouse.getHouseNum().equals(vo.getDoorNo())
                            && saveHouse.getFloor().equals(vo.getFloor()) && saveHouse.getUnitNo().equals(vo.getUnitNo())
                            && saveHouse.getHouseNo().equals(vo.getHouseNo())){
                        populationHouseDO = saveHouse;
                        isExits = false;
                        break;
                    }
                }
                if(vo.getHouseStatus() != null){
                    populationHouseDO.setStatus(vo.getHouseStatus());
                if(isExits){
                    //查询该房屋未建立，执行建立房屋信息
                    populationHouseDO = new ComMngPopulationHouseDO();
                    populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
                    populationHouseDO.setCommunityId(communityId);
                    populationHouseDO.setFloor(vo.getFloor());
                    populationHouseDO.setUnitNo(vo.getUnitNo());
                    populationHouseDO.setHouseNo(vo.getHouseNo());
                    populationHouseDO.setAddress(address);
                    if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
                        populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
                    }
                    if(vo.getHouseStatus() != null){
                        populationHouseDO.setStatus(vo.getHouseStatus());
                    }
                    if(vo.getHousePurpose() != null){
                        populationHouseDO.setPurpose(vo.getHousePurpose());
                    }
                    if(vo.getControlStatus() != null){
                        populationHouseDO.setControlStatus(vo.getControlStatus());
                    }
                    comMngPopulationHouseDAO.insert(populationHouseDO);
                    saveHouseList.add(populationHouseDO);
                }
                if(vo.getHousePurpose() != null){
                    populationHouseDO.setPurpose(vo.getHousePurpose());
                }
                if(vo.getControlStatus() != null){
                    populationHouseDO.setControlStatus(vo.getControlStatus());
                }
                comMngPopulationHouseDAO.insert(populationHouseDO);
            }

            if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){