爱心义仓修改

puhanshu

2021-10-13 f7c16d24f7cb0d2b9e03ec24bfdbb72a11def5f9

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

@@ -171,6 +171,11 @@
        return R.ok(this.comMngPopulationDAO.getSecondHouseAddress(cascadeHouseDTO.getCommunityId()));
    }

    @Override
    public R getSecondHouse(CascadeHouseDTO cascadeHouseDTO) {
        return R.ok(this.comMngPopulationDAO.getSecondHouse(cascadeHouseDTO.getCommunityId()));
    }

    /**
     * 分页查询房屋列表
     *
@@ -190,25 +195,27 @@
                        break;
                    case 2:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
//                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        break;
                    case 3:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
//                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
                        break;
                    case 4:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
                        populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
//                        populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
                        break;
                    case 5:
                        populationHouseAdminDTO.setRoad(houseDO.getAlley());
                        populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
                        populationHouseAdminDTO.setFloor(houseDO.getFloor());
                        populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
                        populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo());
                        if(populationHouseAdminDTO.getLevelIsAll() == null){
                            populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo());
                        }
                        break;
                    default:
                        break;
@@ -390,7 +397,7 @@
            }
            // 查询该房屋的住户信息
            List<PopulationListVO> populationList =
                this.baseMapper.getGridVillageBuildingPopulationList(buildingHouseDetailVO.getId(), null, 1);
                this.baseMapper.getGridVillageBuildingPopulationList(buildingHouseDetailVO.getId(), null, null);
            if (!populationList.isEmpty()) {
                populationList.forEach(population -> {
                    try {