广州市综治平台后端
xusd
1 days ago 7c5849b2e532a42a3136157ede6ef57b69f8212b
fix:sql脚本
2 files modified
94 ■■■■ changed files
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java 67 ●●●●● patch | view | raw | blame | history
sql/20250704.sql 27 ●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -1526,30 +1526,23 @@
            sortType(caseStatisticsTypeDTOS);
        }
        Integer typeTotalNum = 0;
        Integer otherCaseNum = 0;
        int i = 1;
        List<CaseStatisticsTypeDTO> typeList = new ArrayList<>();
        for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : caseStatisticsTypeDTOS) {
            typeTotalNum = typeTotalNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
            if (i < 6 && !"其他".equals(caseStatisticsTypeDTO.getCaseTypeName())) {
                typeList.add(caseStatisticsTypeDTO);
                i++;
            } else {
                otherCaseNum = otherCaseNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
            }
        }
        for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : typeList) {
            caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
        }
        if (otherCaseNum > 0) {
            CaseStatisticsTypeDTO caseStatisticsTypeDTO = new CaseStatisticsTypeDTO();
            caseStatisticsTypeDTO.setCaseTypeName("其他");
            caseStatisticsTypeDTO.setCaseNum(otherCaseNum);
            caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
            typeList.add(caseStatisticsTypeDTO);
            caseStatisticsBaseDTO.setTypeList(typeList);
        }
        }
        for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : caseStatisticsTypeDTOS) {
            caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
        }
//        if (otherCaseNum > 0) {
//            CaseStatisticsTypeDTO caseStatisticsTypeDTO = new CaseStatisticsTypeDTO();
//            caseStatisticsTypeDTO.setCaseTypeName("其他");
//            caseStatisticsTypeDTO.setCaseNum(otherCaseNum);
//            caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
//            typeList.add(caseStatisticsTypeDTO);
//            caseStatisticsBaseDTO.setTypeList(typeList);
//        }
        caseStatisticsBaseDTO.setTypeList(caseStatisticsTypeDTOS);
        //事项来源
        terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
        CaseStatisticsSourceDTO oneSource = mapper.statisticsSource(terms);
@@ -2267,29 +2260,25 @@
                sortType(caseStatisticsTypeDTOS);
            }
            Integer typeTotalNum = 0;
            Integer otherCaseNum = 0;
            int i = 1;
            List<CaseStatisticsTypeDTO> typeList = new ArrayList<>();
//            Integer otherCaseNum = 0;
//            int i = 1;
//            List<CaseStatisticsTypeDTO> typeList = new ArrayList<>();
            for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : caseStatisticsTypeDTOS) {
                typeTotalNum = typeTotalNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
                if (i < 6 && !"其他".equals(caseStatisticsTypeDTO.getCaseTypeName())) {
                    typeList.add(caseStatisticsTypeDTO);
                    i++;
                } else {
                    otherCaseNum = otherCaseNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
                }
            }
            for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : typeList) {
            for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : caseStatisticsTypeDTOS) {
                caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
            }
            if (otherCaseNum > 0) {
                CaseStatisticsTypeDTO caseStatisticsTypeDTO = new CaseStatisticsTypeDTO();
                caseStatisticsTypeDTO.setCaseTypeName("其他");
                caseStatisticsTypeDTO.setCaseNum(otherCaseNum);
                caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
                typeList.add(caseStatisticsTypeDTO);
                caseStatisticsBaseDTO.setTypeList(typeList);
            }
//            if (otherCaseNum > 0) {
//                CaseStatisticsTypeDTO caseStatisticsTypeDTO = new CaseStatisticsTypeDTO();
//                caseStatisticsTypeDTO.setCaseTypeName("其他");
//                caseStatisticsTypeDTO.setCaseNum(otherCaseNum);
//                caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
//                typeList.add(caseStatisticsTypeDTO);
//                caseStatisticsBaseDTO.setTypeList(typeList);
//            }
            caseStatisticsBaseDTO.setTypeList(caseStatisticsTypeDTOS);
        }
        List<QueAreaDTO> queArea = listAreaByType(areaCode);
sql/20250704.sql
@@ -42,15 +42,34 @@
insert into "HUGETEST"."dyh_sy_cause"("id", "name", "level", "parent_id", "issue_id", "create_time", "update_time", "icon") VALUES('24_02-76','涉法涉诉纠纷','2','24_01-11',null,'2025-07-04','2025-07-04',null);
delete from dyh_sy_cause  where id ='24_02-51';
delete from dyh_sy_cause where id = '24_02-52';
delete from dyh_sy_cause where id = '24_02-56';
delete from dyh_sy_cause where id = '24_02-67';
delete from dyh_sy_cause  where id ='24_02-70';
delete from dyh_sy_cause where id = '24_02-71';
update "dyh_sy_cause" set parent_id = '24_01-1' where id='24_02-59';
update "dyh_sy_cause" set parent_id = '24_01-1' where id='24_02-69';
update "dyh_sy_cause" set parent_id = '24_01-1' where id='24_02-62';
update "dyh_sy_cause" set parent_id = '24_01-1' where id='24_02-60';
update "dyh_sy_cause" set parent_id = '24_01-4' where id='24_02-58';
update "dyh_sy_cause" set parent_id = '24_01-7' where id='24_02-65';
update "dyh_sy_cause" set parent_id = '24_01-7' where id='24_02-64';
update "dyh_sy_cause" set parent_id = '24_01-7' where id='24_02-68';
update "dyh_sy_cause" set parent_id = '24_01-7' where id='24_02-66';
update "dyh_sy_cause" set parent_id = '24_01-9' where id='24_02-57';
update "dyh_sy_cause" set parent_id = '24_01-9' where id='24_02-61';
update "dyh_sy_cause" set parent_id = '24_01-9' where id='24_02-63';
update "dyh_case_info" set case_type_first = '24_01-3' ,case_type_first_name='城市管理' where case_type='24_02-25';
update "dyh_case_info" set case_type_first = '24_01-1' ,case_type_first_name='市场监管' where case_type='24_02-5';
update "dyh_case_info" set case_type_first = '24_01-2' ,case_type_first_name='劳动社保' where case_type='24_02-9';