From 43729e4c8fa9b1f44bdbfd2ebe33092d0b109b22 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Mon, 23 Sep 2024 10:01:00 +0800
Subject: [PATCH] 纠纷态势-优化
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml | 2 +-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
index 58419b0..0e5b563 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -337,7 +337,7 @@
and a.que_road = #{terms.queRoad}
</if>
<if test="terms.isArea != null and terms.isArea !=''">
- and a.que_city is not null
+ and a.que_city is not null and a.que_area is not null and a.que_road is not null
</if>
</where>
</if>
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 448a1f0..9b5bb46 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
@@ -1009,9 +1009,15 @@
//事项来源
terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
CaseStatisticsSourceDTO oneSource = mapper.statisticsSource(terms);
+ if(ObjectUtils.isEmpty(oneSource)){
+ oneSource = new CaseStatisticsSourceDTO();
+ }
oneSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_2.getIndex());
CaseStatisticsSourceDTO twoSource = mapper.statisticsSource(terms);
+ if(ObjectUtils.isEmpty(twoSource)){
+ twoSource = new CaseStatisticsSourceDTO();
+ }
twoSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_2.getDes());
Integer sourceTotalNum = dellNull(oneSource.getCaseNum()) + dellNull(oneSource.getCaseNum());
--
Gitblit v1.8.0