议题主表添加字段

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;
+
     /**
      * 创建话题用户身份标识
      */

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;
 }

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},

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,