From 472b6b10d33b0c82c85f9422ae772853d2acd4e6 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Sat, 20 May 2023 14:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E6=9D=91=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=9E=E7=90=86=E6=83=85=E5=86=B5=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GridOrVillageEventRateResultDTO.java      |  2 ++
 .../main/java/com/epmet/dao/IcEventDao.java   |  2 +-
 .../service/impl/IcEventServiceImpl.java      | 11 +++++---
 .../src/main/resources/mapper/IcEventDao.xml  | 26 ++++++++++++++-----
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java
index 3d069b9d3d..8197f035bf 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/GridOrVillageEventRateResultDTO.java
@@ -20,6 +20,8 @@ public class GridOrVillageEventRateResultDTO implements Serializable {
      */
     private String agencyName;
 
+    private String gridId;
+
     /**
      * 完结事件数量
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
index dcb065bd5a..40e6b3c65a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
@@ -215,5 +215,5 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
 
     List<IcEventResultDTO> getListBySourceTypeOrEventType(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType, @Param("eventType") String eventType);
 
-    GridOrVillageEventRateResultDTO getEventRateByGridIds(@Param("orgId") String orgId);
+    List<GridOrVillageEventRateResultDTO> getEventRateByGridIds(@Param("orgIds") List<String> orgIds);
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index ed8c018018..691098277d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -2013,14 +2013,19 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         if (StringUtils.isNotEmpty(agencyId)) {
             List<IcEventAnalysisOrgResDTO> orgs = getSubOrgs(agencyId);
             if (null != orgs && orgs.size() > 0) {
+                Map<String, String> namesMap = new HashMap<>();
                 for (IcEventAnalysisOrgResDTO org : orgs) {
-                    GridOrVillageEventRateResultDTO dto = baseDao.getEventRateByGridIds(org.getOrgId());
+                    namesMap.put(org.getOrgId(), org.getOrgName());
+                }
+                List<String> ids = orgs.stream().map(IcEventAnalysisOrgResDTO::getOrgId).collect(Collectors.toList());
+                List<GridOrVillageEventRateResultDTO> resultList = baseDao.getEventRateByGridIds(ids);
+                for (GridOrVillageEventRateResultDTO dto : resultList) {
                     if (null != dto) {
-                        dto.setAgencyName(org.getOrgName());
+                        dto.setAgencyName(namesMap.get(dto.getGridId()));
                         dto.setRate(dto.getRate() == null ? 0 : dto.getRate());
                         dtoList.add(dto);
                     } else {
-                        dto.setAgencyName(org.getOrgName());
+                        dto.setAgencyName(namesMap.get(dto.getGridId()));
                         dto.setRate(0.00);
                         dto.setTotal(0);
                         dtoList.add(dto);
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 8562041da5..6ea141687b 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
@@ -675,28 +675,40 @@
     <select id="getEventRateByGridIds" resultType="com.epmet.dto.result.GridOrVillageEventRateResultDTO">
         SELECT
             ea.total AS total,
+            ea.gridId AS gridId,
             eb.total,
-            ROUND(eb.total/ea.total,2) as rate
+            ROUND(eb.total/ea.total,2) AS rate
         FROM
             (
-                SELECT count( e.id ) AS total  FROM ic_event e
+                SELECT
+                    count( e.id ) AS total,
+                    e.GRID_ID AS gridId
+                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 != orgId and orgId !=''">
-                        AND e.GRID_ID = #{orgId}
+                    <if test="null != orgIds and orgIds.size >0">
+                        AND e.GRID_ID IN(
+                        <foreach collection="orgIds" item="orgId" separator=",">
+                            #{orgId}
+                        </foreach>)
                     </if>
                 </where>
-            ) ea,
+            GROUP BY e.GRID_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 != orgId and orgId !=''">
-                        AND e.GRID_ID = #{orgId}
+                    <if test="null != orgIds and orgIds.size >0">
+                        AND e.GRID_ID IN(
+                        <foreach collection="orgIds" item="orgId" separator=",">
+                            #{orgId}
+                        </foreach>)
                     </if>
                 </where>
+                GROUP BY e.GRID_ID
             ) eb
     </select>