fix:解纷态势-区选择还出现区问题修复

zhouxiantao

2024-10-22 f6a7fafd16a3b088adc9017cfdfedf065ec8a3d6

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java

@@ -1008,24 +1008,32 @@
        CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId);
        String areaCode = null;
        //目前没有村居数据，所以单位等级是4的也归集到3里面
        List<Integer> unitGrades = new ArrayList<>();
        if(ctUnitDTO.getUnitGrade().equals(1)){
            terms.put("queCity", ctUnitDTO.getCity());
            areaCode = ctUnitDTO.getCity();
            unitGrades.add(ctUnitDTO.getUnitGrade());
        }else if(ctUnitDTO.getUnitGrade().equals(2)){
            terms.put("queArea", ctUnitDTO.getArea());
            areaCode = ctUnitDTO.getArea();
            unitGrades.add(ctUnitDTO.getUnitGrade());
        }else if(ctUnitDTO.getUnitGrade().equals(3) || ctUnitDTO.getUnitGrade().equals(4)){
            terms.put("queRoad", ctUnitDTO.getRoad());
            areaCode = ctUnitDTO.getRoad();
        }

        //目前没有村居，所以区和街道进来都是按街道展示
        String areaType = null;//兼容白云数据
        List<Integer> unitGrades = new ArrayList<>();
        if(ObjectUtils.isNotEmpty(terms.get("queRoad"))){
            terms.put("areaType","2");
            areaType = "2";
            areaCode = terms.get("queRoad")+"";
            unitGrades.add(3);
            unitGrades.add(4);
        }
        //目前没有村居，所以区和街道进来都是按街道展示
        if(ObjectUtils.isNotEmpty(terms.get("queRoad")) || ObjectUtils.isNotEmpty(terms.get("queArea"))){
        }else if(ObjectUtils.isNotEmpty(terms.get("queArea"))){
            terms.put("areaType","2");
            areaType = "2";
            areaCode = terms.get("queArea")+"";
            unitGrades.add(2);
        }else{
            areaType = "1";
            unitGrades.add(1);
            areaCode = ctUnitDTO.getCity();
        }
        //基础数据统计
        CaseStatisticsBaseDTO caseStatisticsBaseDTO = mapper.statisticsBase(terms);
@@ -1062,15 +1070,18 @@
            }
        }
        areaList.add(allArea);
        Map<String, String> area = getArea();
        for (String areaName : area.keySet()) {
            if(!areaNames.contains(areaName)){
                CaseStatisticsAreaDTO areaChild = new CaseStatisticsAreaDTO();
                areaChild.setAreaCode(area.get(areaName));
                areaChild.setAreaName(areaName);
                areaList.add(areaChild);
        if("1".equals(areaType)){
            Map<String, String> area = getArea();
            for (String areaName : area.keySet()) {
                if(!areaNames.contains(areaName)){
                    CaseStatisticsAreaDTO areaChild = new CaseStatisticsAreaDTO();
                    areaChild.setAreaCode(area.get(areaName));
                    areaChild.setAreaName(areaName);
                    areaList.add(areaChild);
                }
            }
        }

        List<QueAreaDTO> queArea = listAreaByType(areaCode);
        log.info("listAreaByType {}", JSON.toJSONString(queArea));
        for (QueAreaDTO caseAreaDTO : queArea) {