修改bug

huanghongfa

2021-05-25 42eaf1bd4d5465cb3ba3c1b5f7abc86dd2ea88eb

修改bug

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

@@ -54,29 +54,44 @@
            case 1:
                cascadeHouseVOList = this.baseMapper.getHouseLevelByAlley(cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley()))), ArrayList::new));
                cascadeHouseVOList.forEach(cascade -> {
                    cascade.setName(cascade.getAlley());
                });
                break;
            case 2:
                if(houseDO != null){
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNum(houseDO.getAlley(),cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum()))), ArrayList::new));
                    cascadeHouseVOList.forEach(cascade -> {
                        cascade.setName(cascade.getHouseNum());
                    });
                }
                break;
            case 3:
                if(houseDO != null) {
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByFloor(houseDO.getAlley(), houseDO.getHouseNum(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor()))), ArrayList::new));
                    cascadeHouseVOList.forEach(cascade -> {
                        cascade.setName(cascade.getFloor());
                    });
                }
                break;
            case 4:
                if(houseDO != null) {
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByUnitNo(houseDO.getAlley(), houseDO.getHouseNum(), houseDO.getFloor(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor() + ";" + o.getUnitNo()))), ArrayList::new));
                    cascadeHouseVOList.forEach(cascade -> {
                        cascade.setName(cascade.getUnitNo());
                    });
                }
                break;
            case 5:
                if(houseDO != null) {
                    cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNo(houseDO.getAlley(), houseDO.getHouseNum(), houseDO.getFloor(), houseDO.getUnitNo(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
                    cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor() + ";" + o.getUnitNo() + ";" + o.getHouseNo()))), ArrayList::new));
                    cascadeHouseVOList.forEach(cascade -> {
                        cascade.setName(cascade.getHouseNo());
                    });
                }
                break;
            default: