From 20b7a726e2d4bce9e14c640905257686c40d3536 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 18 May 2023 15:44:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=92=E6=A1=A3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=92=8C=E5=BD=92=E6=A1=A3=E7=8E=87=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/EventAnalysisResultDTO.java  |  9 +++++++++
 .../com/epmet/dto/result/EventRateResultDTO.java  | 15 ++++++++++++---
 .../epmet/service/impl/IcEventServiceImpl.java    |  1 +
 .../src/main/resources/mapper/IcEventDao.xml      | 12 ++++++++++--
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java
index 906e984e35..e34285d2fd 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java
@@ -26,6 +26,10 @@ public class EventAnalysisResultDTO implements Serializable {
      */
     private Integer wangGeHua;
 
+    /**
+     * 归档数量
+     */
+    private Integer guiDang;
     /**
      * 红灯占比
      */
@@ -41,4 +45,9 @@ public class EventAnalysisResultDTO implements Serializable {
      */
     private Double yiJieAnRate;
 
+    /**
+     * 归档占比
+     */
+
+    private Double guiDangRate;
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java
index bea7f93e10..efd13ccbf6 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java
@@ -37,20 +37,29 @@ public class EventRateResultDTO implements Serializable {
     private Integer lanDeng;
 
     /**
-     * 红灯占比
+     * 归档数量
+     */
+    private Integer guiDang;
+
+    /**
+     * 未响应占比
      */
     private Double hongDengRate;
 
     /**
-     * 黄灯占比
+     * 处理中占比
      */
     private Double huangDengRate;
 
     /**
-     * 蓝灯占比
+     * 已完成占比
      */
     private Double lanDengRate;
 
+    /**
+     * 归档占比
+     */
+    private Double guiDangRate;
     /**
      * 分类统计数量
      */
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 0b2fbb6e0f..8364ff7231 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
@@ -1962,6 +1962,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         dto.setDaiChuLiRate(erDto.getHongDengRate() == null ? 0 : erDto.getHongDengRate());
         dto.setChuLiZhongRate(erDto.getHuangDengRate() == null ? 0 : erDto.getHuangDengRate());
         dto.setYiJieAnRate(erDto.getLanDengRate() == null ? 0 : erDto.getLanDengRate());
+        dto.setGuiDangRate(erDto.getGuiDangRate() == null ? 0 : erDto.getGuiDangRate());
         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 36e6d7c8e9..550fce527e 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
@@ -446,9 +446,11 @@
             eb.hong AS hongDeng,
             ec.huang AS huangDeng,
             ed.lan as lanDeng,
+            ee.dang as guiDang,
             ROUND( eb.hong / ea.countAll, 2 ) AS hongDengRate,
             ROUND( ec.huang / ea.countAll, 2 ) AS huangDengRate,
-            ROUND( ed.lan / ea.countAll, 2 ) as lanDengRate
+            ROUND( ed.lan / ea.countAll, 2 ) as lanDengRate,
+            ROUND( ee.dang / ea.countAll, 2) as guiDangRate
         FROM
             ( SELECT
                     SUM( CASE WHEN a.OPERATION_TYPE IS NULL OR a.OPERATION_TYPE = 0 THEN 1 ELSE 0 END ) AS countAll
@@ -477,7 +479,13 @@
                 <if test="null != orgIdPath and orgIdPath != ''">
                     and d.GRID_PIDS like concat(#{orgIdPath},'%')
                 </if>
-            ) ed
+            ) ed,
+            ( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 THEN 1 ELSE 0 END ) as dang
+                FROM ic_event d WHERE d.DEL_FLAG = 0
+                <if test="null != orgIdPath and orgIdPath != ''">
+                    and d.GRID_PIDS like concat(#{orgIdPath},'%')
+                </if>
+            ) ee
     </select>
 
     <select id="getEventAnalysis" resultType="com.epmet.dto.result.EventAnalysisResultDTO">