From df86e8524aacccea63f3a112f1beefe42da9f666 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Sat, 20 May 2023 14:48:45 +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 +-
 .../service/impl/IcEventServiceImpl.java      | 28 +++++++++++++------
 .../src/main/resources/mapper/IcEventDao.xml  |  3 +-
 3 files changed, 22 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 8197f035bf..755af9fff5 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,7 +20,7 @@ public class GridOrVillageEventRateResultDTO implements Serializable {
      */
     private String agencyName;
 
-    private String gridId;
+    private String orgId;
 
     /**
      * 完结事件数量
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 691098277d..ea9d011ae0 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
@@ -2019,18 +2019,30 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 }
                 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(namesMap.get(dto.getGridId()));
-                        dto.setRate(dto.getRate() == null ? 0 : dto.getRate());
-                        dtoList.add(dto);
-                    } else {
-                        dto.setAgencyName(namesMap.get(dto.getGridId()));
+                if(null != resultList && resultList.size()> 0){
+                    for (GridOrVillageEventRateResultDTO dto : resultList) {
+                        if (null != dto) {
+                            dto.setAgencyName(namesMap.get(dto.getOrgId()));
+                            dto.setRate(dto.getRate() == null ? 0 : dto.getRate());
+                            dtoList.add(dto);
+                        } else {
+                            dto.setAgencyName(namesMap.get(dto.getOrgId()));
+                            dto.setRate(0.00);
+                            dto.setTotal(0);
+                            dtoList.add(dto);
+                        }
+                    }
+                }else {
+                    namesMap.keySet().forEach(key->{
+                        GridOrVillageEventRateResultDTO dto = new GridOrVillageEventRateResultDTO();
+                        dto.setOrgId(key);
+                        dto.setAgencyName(namesMap.get(key));
                         dto.setRate(0.00);
                         dto.setTotal(0);
                         dtoList.add(dto);
-                    }
+                    });
                 }
+
             }
         }
         return dtoList;
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 6ea141687b..ab3f0b13df 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,7 +675,7 @@
     <select id="getEventRateByGridIds" resultType="com.epmet.dto.result.GridOrVillageEventRateResultDTO">
         SELECT
             ea.total AS total,
-            ea.gridId AS gridId,
+            ea.gridId AS orgId,
             eb.total,
             ROUND(eb.total/ea.total,2) AS rate
         FROM
@@ -708,7 +708,6 @@
                         </foreach>)
                     </if>
                 </where>
-                GROUP BY e.GRID_ID
             ) eb
     </select>