From d7ee918a3b1b5abd09d358f3bd9ce7ab62952466 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Wed, 17 May 2023 21:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8DBug=EF=BC=8C=E6=A0=B9=E6=8D=AEID=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=94=99=E8=AF=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcEventDao.java          | 5 ++++-
 .../java/com/epmet/service/impl/IcEventServiceImpl.java  | 8 +++++---
 .../src/main/resources/mapper/IcEventDao.xml             | 9 ++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

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 116e943c85..9622cb94e0 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
@@ -152,5 +152,8 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
 
     EventAnalysisResultDTO getEventAnalysis(@Param("orgIdPath") String orgPath);
 
-    Map<String,Integer> getAnalysis(@Param("orgIdPath") String orgPath);
+    @MapKey("code")
+    List<Map<String,Integer>> getAnalysis(@Param("orgIdPath") String orgPath);
+
+    IcEventEntity selectByEventId(String icEventId);
 }
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 4b357e94b5..0bd204d223 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
@@ -783,7 +783,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     @Transactional(rollbackFor = Exception.class)
     public void reply(IcEventReplyFormDTO formDTO) {
         //1.查询事件数据 判断是否允许回复
-        IcEventEntity entity = baseDao.selectById(formDTO.getIcEventId());
+        IcEventEntity entity = baseDao.selectByEventId(formDTO.getIcEventId());
         if (null == entity || "1".equals(entity.getOperationType()) || "2".equals(entity.getOperationType())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前事件不允许回复");
         }
@@ -1933,9 +1933,11 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         EventAnalysisResultDTO dto = baseDao.getEventAnalysis(getOrgPath(orgId,orgType));
         Result<Map<String, String>> categoryMap = govIssueOpenFeignClient.getCategoryMap(EpmetRequestHolder.getLoginUserCustomerId());
         if (null != categoryMap && categoryMap.getData().size() > 0) {
-            Map<String,Integer> dataMap = baseDao.getAnalysis(getOrgPath(orgId,orgType));
+            List<Map<String,Integer>> dataMap = baseDao.getAnalysis(getOrgPath(orgId,orgType));
             if (null != dataMap && dataMap.size() > 0) {
-                dto.setCategoryCount(dataMap);
+                Map<String, Integer> merged = new HashMap<>();
+                dataMap.forEach(merged::putAll);
+                dto.setCategoryCount(merged);
             }
         }
         return 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 5235b1d585..c54d278f8b 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
@@ -510,10 +510,10 @@
 
     </select>
 
-    <select id="getAnalysis" resultType="java.util.Map">
+    <select id="getAnalysis" resultType="java.util.List">
         SELECT
-            c.CATEGORY_ID,
-            SUM(c.CATEGORY_ID)
+            c.CATEGORY_ID as code,
+            COUNT(c.CATEGORY_ID) as total
         FROM ic_event_category c
         <where>
             c.IC_EVENT_ID in (
@@ -526,4 +526,7 @@
         GROUP BY c.CATEGORY_ID
     </select>
 
+    <select id="selectByEventId" resultType="com.epmet.entity.IcEventEntity">
+        select e.* from ic_event e where e.id = #{icEventId}
+    </select>
 </mapper>