From 1c29fad1a32e621b6d870d8fbf1b663c7bb57095 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 24 Sep 2020 17:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E4=B8=BB=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/extract/form/IssueMainDailyFormDTO.java    | 5 +++++
 .../com/epmet/dto/extract/result/IssueInfoResultDTO.java     | 5 +++++
 .../evaluationindex/extract/FactOriginIssueMainDailyDao.xml  | 2 ++
 .../src/main/resources/mapper/issue/StatsIssueDao.xml        | 5 ++---
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java
index 0f4fccc58f..5cbaa9f748 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java
@@ -91,6 +91,11 @@ public class IssueMainDailyFormDTO implements Serializable {
      */
     private String issueStatus;
 
+    /**
+     * 关闭状态
+     */
+    private String resolveType;
+
     /**
      * 创建话题用户身份标识
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueInfoResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueInfoResultDTO.java
index 4dd3bcac07..b09aefb549 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueInfoResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueInfoResultDTO.java
@@ -47,4 +47,9 @@ public class IssueInfoResultDTO implements Serializable {
      * 用户ID
      */
     private String userId;
+
+    /**
+     * 关闭状态
+     */
+    private String resolveType;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
index 5e3b556b12..307c371eab 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
@@ -22,6 +22,7 @@
         PIDS,
         AGENCY_ID,
         ISSUE_STATUS,
+        RESOLVE_TYPE,
         TOPIC_USER_IS_PARTY,
         DEL_FLAG,
         REVISION,
@@ -48,6 +49,7 @@
                 #{item.pids},
                 #{item.agencyId},
                 #{item.issueStatus},
+                #{item.resolveType},
                 #{item.topicUserIsParty},
                 #{item.delFlag},
                 #{item.revision},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
index e226e3964d..eeb0458c56 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
@@ -209,9 +209,8 @@
     <select id="selectIssueInfo" resultType="com.epmet.dto.extract.result.IssueInfoResultDTO">
         SELECT
             ID AS issueId,
-            (case when RESOLVE_TYPE = 'resolved' then 'closed_resolved'
-                  when RESOLVE_TYPE = 'unresolved' then 'closed_unresolved'
-                  else ISSUE_STATUS end ) AS ISSUE_STATUS,
+            ISSUE_STATUS,
+            RESOLVE_TYPE as resolveType,
             SOURCE_ID AS topicId,
             CUSTOMER_ID,
             GRID_ID,