feature：非警务纠纷优化

xusd

2025-06-13 64db03a5eb8ece65c6487f9f3370f8b6ebfe0b8b

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

@@ -2203,16 +2203,16 @@
        // 重新获取纠纷类型统计（基于完整的选择类型条件）
        List<CaseStatisticsTypeDTO> caseStatisticsTypeDTOS = mapper.statisticsTypeFirst(terms);

        // // 如果基于选择类型的查询结果为空，则使用全量数据进行纠纷类型统计
        // if (ObjectUtils.isEmpty(caseStatisticsTypeDTOS)) {
        //     // 临时移除所有类型筛选条件，获取全量纠纷类型统计
        //     terms.remove("canal");
        //     terms.remove("canalSecond");
        //     terms.remove("canalList");
        //     terms.remove("canalSecondNot");
        //     terms.remove("canalSecondAll");
        //     caseStatisticsTypeDTOS = mapper.statisticsTypeFirst(terms);
        // }
        // 如果基于选择类型的查询结果为空，则使用全量数据进行纠纷类型统计
        if (ObjectUtils.isEmpty(caseStatisticsTypeDTOS)) {
            // 临时移除所有类型筛选条件，获取全量纠纷类型统计
            terms.remove("canal");
            terms.remove("canalSecond");
            terms.remove("canalList");
            terms.remove("canalSecondNot");
            terms.remove("canalSecondAll");
            caseStatisticsTypeDTOS = mapper.statisticsTypeFirst(terms);
        }

        if (ObjectUtils.isNotEmpty(caseStatisticsTypeDTOS)) {
            sortType(caseStatisticsTypeDTOS);
@@ -2526,7 +2526,9 @@
            } else {
                terms.put("queryType", 3);
            }
            log.info("xsd:{}",terms);
            CtUnitDTO ctUnitDTO = mapper.getUnitByGridCode(terms);
            log.info("xsd:ctUnitDTO{}",ctUnitDTO);
            if (ObjectUtils.isNotEmpty(ctUnitDTO)) {
                if (StringUtils.isNotBlank(ctUnitDTO.getCity()) && StringUtils.isNotBlank(ctUnitDTO.getCityName())) {
                    registerSaveDTO.setQueCity(ctUnitDTO.getCity());
@@ -2540,8 +2542,8 @@
                    registerSaveDTO.setQueRoad(ctUnitDTO.getRoad());
                    registerSaveDTO.setQueRoadName(ctUnitDTO.getRoadName());
                }
                registerSaveDTO.setWantUnitId(ctUnitDTO.getId());
                registerSaveDTO.setWantUnitName(ctUnitDTO.getUnitName());
//                registerSaveDTO.setWantUnitId(ctUnitDTO.getId());
//                registerSaveDTO.setWantUnitName(ctUnitDTO.getUnitName());

                //网格上报的事件时间一般在凌晨，导致北京时间是昨天，所以+8小时还原为北京时间，确保在同一天内
                Date nowDate1 = DateUtils.getNowDate();
@@ -2620,12 +2622,12 @@
                caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_4.getDes());

                caseInfo.setCaseLevel(3);
                //获取一级类型
                SyCause syCause = sysClient.getParentCaseTypeById(caseInfo.getCaseType());
                if (ObjectUtils.isNotEmpty(syCause)) {
                    caseInfo.setCaseTypeFirst(syCause.getId());
                    caseInfo.setCaseTypeFirstName(syCause.getName());
                }
//                //获取一级类型
//                SyCause syCause = sysClient.getParentCaseTypeById(caseInfo.getCaseType());
//                if (ObjectUtils.isNotEmpty(syCause)) {
//                    caseInfo.setCaseTypeFirst(syCause.getId());
//                    caseInfo.setCaseTypeFirstName(syCause.getName());
//                }
                //默认小程序可见
                if (ObjectUtils.isNotEmpty(caseInfo.getCanal())) {
                    if (CaseBaseConstsEnum.CASE_CANAL_1.getIndex().equals(caseInfo.getCanal())) {
@@ -2634,7 +2636,12 @@
                }
                //todo case_title生成、经纬度转换
                caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
                caseInfo.setCreateTime(nowDate);
                if(registerSaveDTO.getCreateTime()!=null){
                    caseInfo.setCreateTime(registerSaveDTO.getCreateTime());
                }else {
                    caseInfo.setCreateTime(nowDate);
                }

                caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
                //默认添加省市
                caseInfo.setQueProv("19");
@@ -2652,7 +2659,7 @@
                if (StringUtils.isNotBlank(registerSaveDTO.getTcqk())) {
                    caseInfoUnfold.setTcqk(registerSaveDTO.getTcqk());
                }
                caseInfoUnfold.setCreateTime(nowDate);
                caseInfoUnfold.setCreateTime(caseInfo.getCreateTime());
                caseInfoUnfold.setUpdateTime(nowDate);
                caseInfoUnfoldService.save(caseInfoUnfold);
                // 自动调度流程