From 7058eeae7401ed69ca0ec32f3358e63011f77644 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Tue, 23 May 2023 13:25:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E7=BB=9F=E8=AE=A1=E6=96=B9=E6=B3=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcEventDao.xml  | 40 +++++--------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 5e135be6d9..1277b78618 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -571,31 +571,16 @@
 
     <select id="getEventBySourceTypeCount" resultType="com.epmet.dto.result.EventAnalysisResultDTO">
         SELECT
-            ea.jisujiban as jiSuJiBan,
-            eb.zhitonglianban as zhiTongLianBan,
-            ec.wanggehua as wangGeHua
-        from
-            (
-                SELECT count(e.id) as jisujiban from ic_event e
-                WHERE e.DEL_FLAG = 0 and e.SOURCE_TYPE = 0
-                <if test="null != orgIdPath and orgIdPath != ''">
-                    and e.GRID_PIDS like concat(#{orgIdPath},'%')
-                </if>
-            )ea,
-            (
-                SELECT count(e.id) as zhitonglianban from ic_event e
-                WHERE e.DEL_FLAG = 0 and e.SOURCE_TYPE = 1
-                <if test="null != orgIdPath and orgIdPath != ''">
-                    and e.GRID_PIDS like concat(#{orgIdPath},'%')
-                </if>
-            )eb,
-            (
-                SELECT count(e.id) as wanggehua from ic_event e
-                WHERE e.DEL_FLAG = 0 and e.SOURCE_TYPE = 2
-                <if test="null != orgIdPath and orgIdPath != ''">
-                    and e.GRID_PIDS like concat(#{orgIdPath},'%')
-                </if>
-            )ec
+            SUM(CASE WHEN e.SOURCE_TYPE = 0 THEN 1 ELSE 0 END) as jiSuJiBan,
+            SUM(CASE WHEN e.SOURCE_TYPE = 1 THEN 1 ELSE 0 END) as zhiTongLianBan,
+            SUM(CASE WHEN e.SOURCE_TYPE = 2 THEN 1 ELSE 0 END) as wangGeHua
+        FROM ic_event e
+        <where>
+            e.DEL_FLAG = 0
+            <if test="null != orgIdPath and orgIdPath != ''">
+                and e.GRID_PIDS like concat(#{orgIdPath},'%')
+            </if>
+        </where>
     </select>
 
     <select id="getAnalysis" resultType="java.util.Map">
@@ -626,8 +611,7 @@
             e.LONGITUDE,
             e.EVENT_CONTENT AS eventContent,
             r.MANAGE_STATUS AS manageStatus,
-            c.CATEGORY_CODE AS categoryCode,
-            rea.ATTACHMENT_URL AS imgUrl
+            c.CATEGORY_CODE AS categoryCode
     </sql>
 
     <select id="getListByStatus" resultType="com.epmet.dto.result.IcEventResultDTO">
@@ -636,7 +620,6 @@
         FROM ic_event e
         LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
         LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID
-        LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0'
         <where>
             e.DEL_FLAG = 0
             <if test="null != orgIdPath and orgIdPath != ''">
@@ -665,7 +648,6 @@
         FROM ic_event e
         LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
         LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID
-        LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0'
         <where>
             e.DEL_FLAG = 0
             <if test="null != orgIdPath and orgIdPath != ''">

From 138017afe4185e7a241c91f20a6fb1fe913d5234 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Tue, 23 May 2023 13:57:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=97=B6=E4=B8=A2=E5=A4=B1=E5=93=8D=E5=BA=94=E7=BA=A7=E5=88=AB?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20eventType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcEventDTO.java              | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java
index cb8e5a0a2e..1e4d738587 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java
@@ -67,6 +67,11 @@ public class IcEventDTO implements Serializable {
      */
     private String sourceType;
 
+    /**
+     * 响应级别
+     */
+    private String eventType;
+
     /**
      * 发生时间
      */