1、工作视窗报错修改

liyj

2024-10-21 051effad5a4885f28c4ead26e8e8c0da1b3d91d2

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

@@ -1006,10 +1006,18 @@
        terms.put("statistics", "1");
        //根据用户筛选区域范围
        CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId);
        String areaCode = null;
        //目前没有村居数据，所以单位等级是4的也归集到3里面
        List<Integer> unitGrades = new ArrayList<>();
        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();
            unitGrades.add(3);
            unitGrades.add(4);
        }
        //目前没有村居，所以区和街道进来都是按街道展示
        if(ObjectUtils.isNotEmpty(terms.get("queRoad")) || ObjectUtils.isNotEmpty(terms.get("queArea"))){
@@ -1037,7 +1045,7 @@
        List<CaseStatisticsAreaDTO> areaList = new ArrayList<>();
        for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : caseStatisticsAreaDTOS) {
            //本及：承办单位是本及和没有承办单位并且没有下级区域编码
            if(ObjectUtils.isEmpty(caseStatisticsAreaDTO.getAreaCode()) || ctUnitDTO.getUnitGrade().equals(caseStatisticsAreaDTO.getUnitGrade())){
            if(ObjectUtils.isEmpty(caseStatisticsAreaDTO.getAreaCode()) || unitGrades.contains(caseStatisticsAreaDTO.getUnitGrade())){
                allArea.setCaseNum(dellNull(caseStatisticsAreaDTO.getCaseNum()) + dellNull(allArea.getCaseNum()));
                allArea.setResolveNum(dellNull(caseStatisticsAreaDTO.getResolveNum()) + dellNull(allArea.getResolveNum()));
                allArea.setUnResolveNum(dellNull(caseStatisticsAreaDTO.getUnResolveNum()) + dellNull(allArea.getUnResolveNum()));
@@ -1048,7 +1056,7 @@
            }
        }
        areaList.add(allArea);
        List<QueAreaDTO> queArea = listAreaByType(terms.get("queArea"));
        List<QueAreaDTO> queArea = listAreaByType(areaCode);
        log.info("listAreaByType {}", JSON.toJSONString(queArea));
        for (QueAreaDTO caseAreaDTO : queArea) {
            if (!areaCodeList.contains(caseAreaDTO.getAreaCode())) {
@@ -1191,17 +1199,17 @@
                caseStatisticsAreaDTO.setAreaCode(map.get(caseStatisticsAreaDTO.getAreaName()));
            }
        }
        caseStatisticsAreaDTOS.sort((o1, o2) -> {
            Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
            Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
            if (totalScore1 > totalScore2) {
                return 1;
            } else if (totalScore1.equals(totalScore2)) {
                return 0;
            } else {
                return -1;
            }
        });
//        caseStatisticsAreaDTOS.sort((o1, o2) -> {
//            Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
//            Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
//            if (totalScore1 > totalScore2) {
//                return 1;
//            } else if (totalScore1.equals(totalScore2)) {
//                return 0;
//            } else {
//                return -1;
//            }
//        });
        return caseStatisticsAreaDTOS;
    }