From 2ea74568de5adefc41718d0736e7d173b22335fc Mon Sep 17 00:00:00 2001 From: xusd <330628789@qq.com> Date: Wed, 11 Jun 2025 11:22:04 +0800 Subject: [PATCH] feature:市平台项目 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java index 0ede542..6f47029 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java +++ b/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(); -- Gitblit v1.8.0