From 04cd2804f1a96f2d0f7643ab32fded41b86c5c2b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 11 Oct 2022 17:40:01 +0800
Subject: [PATCH] =?UTF-8?q?/gov/issue/issue/allIssueList=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?sourceType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/govissue/result/IssueListResultDTO.java    |  6 +++++-
 .../mapper/govissue/IssueApplicationDao.xml        | 14 ++++++++++++--
 .../main/resources/mapper/govissue/IssueDao.xml    |  6 ++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java
index f1561c2a1b..32186f5212 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java
@@ -108,7 +108,10 @@ public class IssueListResultDTO implements Serializable {
 
     @JsonIgnore
     private String applyStatus;
-
+    /**
+     * 来源类型 话题：resi_topic；直接立议题：issue；事件：ic_event
+     */
+    private String sourceType;
     public IssueListResultDTO() {
         this.issueId = "";
         this.issueTitle = "";
@@ -129,5 +132,6 @@ public class IssueListResultDTO implements Serializable {
         this.projectId = "";
         this.issueClosedTime = 0L;
         this.issueApplicationId = "";
+        this.sourceType="";
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml
index 08db0e9088..fdd1ff4c5f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml
@@ -12,7 +12,12 @@
             ia.TOPIC_ID,
             iah.REASON AS rejectedReason,
             ia.grid_id,
-            ia.apply_status
+            ia.apply_status,
+            (
+                case when ia.TOPIC_ID is not null then 'resi_topic'
+                else ''
+                end
+            ) as sourceType
         FROM issue_application_history iah
         LEFT JOIN issue_application ia ON iah.ISSUE_APPLICATION_ID = ia.ID AND ia.APPLY_STATUS = 'rejected'
         WHERE ia.DEL_FLAG = 0
@@ -31,7 +36,12 @@
             ISSUE_TITLE,
             UNIX_TIMESTAMP(CREATED_TIME) AS auditingTime,
             TOPIC_ID,
-            grid_id
+            grid_id,
+            (
+                case when TOPIC_ID is not null then 'resi_topic'
+                else ''
+                end
+            ) as sourceType
         FROM issue_application
         WHERE DEL_FLAG = 0
             AND (
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
index 495473205c..82c3c09f32 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
@@ -12,7 +12,8 @@
             ISSUE_TITLE AS issueTitle ,
             UNIX_TIMESTAMP(CREATED_TIME) AS createTime,
             SUGGESTION,
-            grid_id
+            grid_id,
+            SOURCE_TYPE as sourceType
         FROM issue
         WHERE DEL_FLAG = '0'
             AND ISSUE_STATUS = #{issueStatus}
@@ -30,7 +31,8 @@
             SUGGESTION ,
             UNIX_TIMESTAMP(SHIFTED_TIME) AS shiftProjectTime,
             grid_id,
-            issue_title
+            issue_title,
+            SOURCE_TYPE as sourceType
         FROM issue
         WHERE DEL_FLAG = '0'
           AND ISSUE_STATUS = 'shift_project'