From 5b06442426a30063334da4365974f857ea7df8aa Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Thu, 19 May 2022 10:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E3=80=91=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ProcessStatusRatioResultDTO.java | 8 ++++----
 .../java/com/epmet/service/impl/IcEventServiceImpl.java   | 7 +++++++
 .../src/main/resources/mapper/IcEventDao.xml              | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessStatusRatioResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessStatusRatioResultDTO.java
index b166788691..2028c30671 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessStatusRatioResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessStatusRatioResultDTO.java
@@ -4,8 +4,8 @@ import lombok.Data;
 
 @Data
 public class ProcessStatusRatioResultDTO {
-    private Long processingCount;
-    private Long closedCount;
-    private Double processingRatio;
-    private Double closedRatio;
+    private Long processingCount = 0l;
+    private Long closedCount = 0l;
+    private Double processingRatio = 0d;
+    private Double closedRatio = 0d;
 }
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 bcfb158e51..b8f983cd31 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
@@ -402,6 +402,10 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
         ProcessStatusRatioResultDTO r = new ProcessStatusRatioResultDTO();
 
+        if (CollectionUtils.isEmpty(m)) {
+            return r;
+        }
+
         BigDecimal processingCount = new BigDecimal(0);
         BigDecimal closedCount = new BigDecimal(0);
         ;
@@ -591,6 +595,9 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 "【事件研判分析】查找家属失败");
 
         ArrayList<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
+        if (CollectionUtils.isEmpty(dependents)) {
+            return dependents;
+        }
         for (HouseUserDTO u : familyInfo.getHouseUserList()) {
             dependents.add(new IcEventYpAnalysisResultDTO.Dependent(u.getIcResiUserId(), u.getIcUserName()));
         }
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 100f641659..50c9bbdf6f 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
@@ -63,7 +63,7 @@
               and c.CATEGORY_CODE = #{categoryCode}
           </if>
         </where>
-        order by CREATE_TIME desc
+        order by e.CREATED_TIME desc
     </select>
     <select id="listMonthlyEventCount" resultType="com.epmet.dto.result.IcEventMonthlyCountResultDTO">
         select t.monthName, count(1) eventCount