From ce06ef6d4e1f1806b5cec380fdd35362995f3a99 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Tue, 23 May 2023 16:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=84=E6=9D=91=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=9C=AA=E6=98=BE=E7=A4=BA=E6=96=B0=E6=9D=91=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/IcEventDTO.java   |  6 ++++
 .../src/main/resources/mapper/IcEventDao.xml  | 33 +++++++++----------
 2 files changed, 22 insertions(+), 17 deletions(-)

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 1e4d738587..ae22f9570e 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
@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -72,6 +73,11 @@ public class IcEventDTO implements Serializable {
      */
     private String eventType;
 
+    /**
+     * 二类分类Id
+     */
+    private List<String> categoryList;
+
     /**
      * 发生时间
      */
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 1277b78618..95dcf768a0 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
@@ -666,16 +666,15 @@
     <select id="getEventRateByGridIds" resultType="com.epmet.dto.result.GridOrVillageEventRateResultDTO">
         SELECT
             ea.total AS total,
-            ea.gridId AS orgId,
+            ea.agencyId AS orgId,
             eb.total,
             ROUND(eb.total/ea.total,2) AS rate
         FROM
             (
                 SELECT
                     count( e.id ) AS total,
-                    e.GRID_ID AS gridId
+                    e.AGENCY_ID AS agencyId
                 FROM ic_event e
-                LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
                 <where>
                     e.DEL_FLAG = 0
                     <if test="null != orgIds and orgIds.size >0">
@@ -685,21 +684,21 @@
                         </foreach>)
                     </if>
                 </where>
-            GROUP BY e.AGENCY_ID
         ) ea,
-            (
-                SELECT count( e.id ) AS total  FROM ic_event e
-                LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
-                <where>
-                    e.DEL_FLAG = 0 AND r.MANAGE_STATUS = 3
-                    <if test="null != orgIds and orgIds.size >0">
-                        AND e.GRID_ID IN(
-                        <foreach collection="orgIds" item="orgId" separator=",">
-                            #{orgId}
-                        </foreach>)
-                    </if>
-                </where>
-            ) eb
+        (
+            SELECT count( e.id ) AS total  FROM ic_event e
+            LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
+            <where>
+                e.DEL_FLAG = 0 AND r.MANAGE_STATUS = 6
+                <if test="null != orgIds and orgIds.size >0">
+                    AND e.AGENCY_ID IN(
+                    <foreach collection="orgIds" item="orgId" separator=",">
+                        #{orgId}
+                    </foreach>)
+                </if>
+            </where>
+            GROUP BY e.AGENCY_ID
+        ) eb
     </select>
 
 </mapper>