From 617f742239f8c7f8ce944b8487ba429ce67a17e9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 4 Jan 2021 17:17:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8ID=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/govissue/result/IssueListResultDTO.java      | 3 +++
 .../src/main/resources/mapper/govissue/IssueApplicationDao.xml | 1 +
 2 files changed, 4 insertions(+)

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 50b6145d7a..950f6f2465 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
@@ -101,6 +101,8 @@ public class IssueListResultDTO implements Serializable {
      */
     private List<String> currentDepartment;
 
+    private String issueApplicationId;
+
     @JsonIgnore
     private Long operationTime;
 
@@ -123,5 +125,6 @@ public class IssueListResultDTO implements Serializable {
         this.currentDepartment = new ArrayList<>();
         this.projectId = "";
         this.issueClosedTime = 0L;
+        this.issueApplicationId = "";
     }
 }
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 79ce6ca12e..987bbc5c74 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
@@ -6,6 +6,7 @@
     <!-- 查询被拒绝的议题 -->
     <select id="issueStatusRejected" resultType="com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO">
         SELECT
+            ia.ID AS issueApplicationId,
             UNIX_TIMESTAMP(iah.CREATED_TIME) AS rejectedTime,
             ia.ISSUE_TITLE,
             ia.TOPIC_ID,