From a58d970029971e5253dee52d77ec8a075aa76a53 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Fri, 25 Oct 2024 10:43:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml | 18 +++++++++---------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 2 +-
2 files changed, 10 insertions(+), 10 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 7e0f953..97be16f 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
@@ -861,9 +861,9 @@
</if>
c.unit_grade as unitGrade,
count(1) as caseNum,
- sum(case when b.medi_result = '22_00025-1' then 1 else 0 end) as resolveNum,
- sum(case when b.medi_result is null and a.info_process <![CDATA[ < ]]> 4 then 1 else 0 end) as resolveingNum,
- sum(case when b.medi_result = '22_00025-2' then 1 else 0 end) as unResolveNum,
+ sum(case when b.medi_result = '22_00025-1' and a.info_process = 3 then 1 else 0 end) as resolveNum,
+ sum(case when a.info_process <![CDATA[ < ]]> 3 then 1 else 0 end) as resolveingNum,
+ sum(case when b.medi_result = '22_00025-2' and a.info_process = 3 then 1 else 0 end) as unResolveNum,
sum(case when a.info_process = 4 then 1 else 0 end) as rejectNum
FROM
dyh_case_info a
@@ -877,9 +877,9 @@
<select id="statisticsBase" resultType="cn.huge.module.cases.domain.dto.CaseStatisticsBaseDTO">
SELECT
count(1) as totalNum,
- sum(case when b.medi_result = '22_00025-1' then 1 else 0 end) as resolveNum,
- sum(case when b.medi_result is null and a.info_process <![CDATA[ < ]]> 4 then 1 else 0 end) as resolveingNum,
- sum(case when b.medi_result = '22_00025-2' then 1 else 0 end) as unResolveNum,
+ sum(case when b.medi_result = '22_00025-1' and a.info_process = 3 then 1 else 0 end) as resolveNum,
+ sum(case when a.info_process <![CDATA[ < ]]> 3 then 1 else 0 end) as resolveingNum,
+ sum(case when b.medi_result = '22_00025-2' and a.info_process = 3 then 1 else 0 end) as unResolveNum,
sum(case when a.case_level = 1 then 1 else 0 end) as oneLevelNum,
sum(case when a.case_level = 2 then 1 else 0 end) as twoLevelNum,
sum(case when a.case_level = 3 then 1 else 0 end) as threeLevelNum,
@@ -920,9 +920,9 @@
<select id="statisticsSource" resultType="cn.huge.module.cases.domain.dto.CaseStatisticsSourceDTO">
SELECT
a.canal,a.canal_name as canalName,count(1) as caseNum,
- sum(case when b.medi_result = '22_00025-1' then 1 else 0 end) as resolveNum,
- sum(case when b.medi_result is null and a.info_process <![CDATA[ < ]]> 4 then 1 else 0 end) as resolveingNum,
- sum(case when b.medi_result = '22_00025-2' then 1 else 0 end) as unResolveNum,
+ sum(case when b.medi_result = '22_00025-1' and a.info_process = 3 then 1 else 0 end) as resolveNum,
+ sum(case when a.info_process <![CDATA[ < ]]> 3 then 1 else 0 end) as resolveingNum,
+ sum(case when b.medi_result = '22_00025-2' and a.info_process = 3 then 1 else 0 end) as unResolveNum,
sum(case when a.info_process = 4 then 1 else 0 end) as rejectNum
FROM
dyh_case_info a
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 1aee3db..e154e08 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
@@ -274,7 +274,7 @@
//默认添加省市
caseInfo.setQueProv("19");
caseInfo.setQueProvName("广东省");
- caseInfo.setQueCity("1601");
+ caseInfo.setQueCity("440100");
caseInfo.setQueCityName("广州市");
// 删除草稿案件
if (1 == registerSaveDTO.getIsDraft()) {
--
Gitblit v1.8.0