From 36b21fdfbdb65f8a9df5c0b7ec2a0cebde8072c9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 20 May 2022 13:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/MyReportIcEvResDTO.java    |  8 ++++++++
 .../src/main/resources/mapper/IcEventDao.xml    | 17 ++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportIcEvResDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportIcEvResDTO.java
index 9e5954fe9c..7fb327037e 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportIcEvResDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportIcEvResDTO.java
@@ -80,6 +80,14 @@ public class MyReportIcEvResDTO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date latestOperatedTime;
 
+    /**
+     * 群众满意度[满意度 - 不满意:bad、基本满意:good、非常满意:perfect]
+     */
+    private String satisfaction;
+    /**
+     * 群众满意度[满意度 - 不满意:bad、基本满意:good、非常满意:perfect]
+     */
+    private String satisfactionName;
     /**
      * 事件附件
      */
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 a596aef481..fb0099a172 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
@@ -292,6 +292,8 @@
         <result property="operationId" column="operation_id"/>
         <result property="redDot" column="red_dot"/>
         <result property="latestOperatedTime" column="latest_operated_time"></result>
+        <result property="satisfaction" column="satisfaction"/>
+        <result property="satisfactionName" column="satisfactionName" />
         <collection property="attachmentList" ofType="com.epmet.dto.IcEventAttachmentDTO"
                     column="icEventId" select="com.epmet.dao.IcEventAttachmentDao.selectByIcEventId"/>
     </resultMap>
@@ -304,10 +306,19 @@
             ie.address,
             ie.`status`,
             IF(ie.status = 'processing','处理中',IF (ie.status = 'closed_case','已办结','')) statusName,
-            ie.operation_type,
-            ie.operation_id,
+            IFNULL(ie.operation_type,'') AS operation_type,
+            IFNULL(ie.operation_id,'') AS operation_id,
             ie.red_dot,
-            ie.latest_operated_time
+            ie.latest_operated_time,
+            IFNULL(ie.satisfaction,'') as satisfaction,
+            (
+                case when satisfaction is null or satisfaction='' then ''
+                when satisfaction='bad' then '不满意'
+                when satisfaction='good' then '基本满意'
+                when satisfaction='perfect' then '非常满意'
+                else ''
+                end
+            ) as satisfactionName
         FROM
             ic_event ie
         WHERE