From fca638bd85eb9e5c04a766e7d5c3f469fe2388ca Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Fri, 20 Sep 2024 17:30:15 +0800
Subject: [PATCH] 态势分析

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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 416174b..350543c 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
@@ -276,6 +276,7 @@
     <sql id="where-part-all">
         <if test="terms != null">
             <where>
+                and delete_status = 0
                 <if test="terms.status != null and terms.status !=''">
                     and a.status = #{terms.status}
                 </if>
@@ -680,14 +681,32 @@
     <!--  统计分析(区域)  -->
     <select id="statisticsArea" resultType="cn.huge.module.cases.domain.dto.CaseStatisticsAreaDTO">
         SELECT
-        a.que_area as areaCode,a.que_area_name as areaName,count(1) as caseNum,
+        <if test="terms.areaType == null or terms.areaType ==''">
+            a.que_area as areaCode,a.que_area_name as areaName,
+        </if>
+        <if test='terms.areaType != null and terms.areaType =="1"'>
+            a.que_area as areaCode,a.que_area_name as areaName,
+        </if>
+        <if test='terms.areaType != null and terms.areaType =="2"'>
+            a.que_road as areaCode,a.que_road_name as areaName,
+        </if>
+        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
         FROM
         dyh_case_info a LEFT JOIN dyh_case_info_unfold b on a.id = b.id
         <include refid="where-part-all"/>
-        group by a.que_area
+        <if test="terms.areaType == null or terms.areaType ==''">
+            group by a.que_area
+        </if>
+        <if test='terms.areaType != null and terms.areaType =="1"'>
+            group by a.que_area
+        </if>
+        <if test='terms.areaType != null and terms.areaType =="2"'>
+            group by a.que_road
+        </if>
+
     </select>
     <!--  统计分析(基础)  -->
     <select id="statisticsBase" resultType="cn.huge.module.cases.domain.dto.CaseStatisticsBaseDTO">

--
Gitblit v1.8.0