fix:解纷态势-区域筛选修复

zhouxiantao

2024-10-21 193c672bd2ed10387f3fec7aa1e1d9ddc7160980

fix:解纷态势-区域筛选修复

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

@@ -1009,6 +1009,7 @@
        String areaCode = null;
        //目前没有村居数据，所以单位等级是4的也归集到3里面
        List<Integer> unitGrades = new ArrayList<>();

        if(ctUnitDTO.getUnitGrade().equals(1)){
            terms.put("queCity", ctUnitDTO.getCity());
            areaCode = ctUnitDTO.getCity();
@@ -1024,8 +1025,12 @@
            unitGrades.add(4);
        }
        //目前没有村居，所以区和街道进来都是按街道展示
        String areaType = null;//兼容白云数据
        if(ObjectUtils.isNotEmpty(terms.get("queRoad")) || ObjectUtils.isNotEmpty(terms.get("queArea"))){
            terms.put("areaType","2");
            areaType = "2";
        }else{
            areaType = "1";
        }
        //基础数据统计
        CaseStatisticsBaseDTO caseStatisticsBaseDTO = mapper.statisticsBase(terms);
@@ -1062,15 +1067,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) {