From 77e25a78acb5f628a344044904a2af0979d1e00d Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 8 Mar 2021 15:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=BB=9F=E4=B8=80=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/issue/result/IssueProgressResultDTO.java | 5 +++++
 .../epdc/dto/item/result/ItemHandleProgressResultDTO.java  | 4 ++++
 .../main/resources/mapper/issue/IssueSummaryHandleDao.xml  | 7 +++++--
 .../resources/mapper/item/ItemSummaryHandleProcessDao.xml  | 7 +++++--
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
index 722ba728..d7207e46 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
@@ -52,4 +52,9 @@ public class IssueProgressResultDTO implements Serializable {
      * 来源社群
      */
     private String groupName;
+
+    /**
+     * 事件ID
+     */
+    private String eventId;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java
index a0a90c95..d4f0d083 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java
@@ -36,6 +36,10 @@ public class ItemHandleProgressResultDTO implements Serializable {
      * 操作人部门
      */
     private String handlerDept;
+    /**
+     * 议题ID
+     */
+    private String issueId;
 
     /**
      * 吹哨部门
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml
index bc2b3b29..18634095 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/issue/IssueSummaryHandleDao.xml
@@ -11,6 +11,7 @@
         <result property="handlerDept" column="HANDLER_DEPT"/>
         <result property="mobile" column="MOBILE"/>
         <result property="groupName" column="GROUP_NAME"/>
+        <result property="eventId" column="EVENT_ID"/>
     </resultMap>
     <select id="selectListOfIssuesHandle" resultMap="issueProgressMap">
         SELECT
@@ -20,11 +21,13 @@
             hd.ADVICE,
             hd.HANDLER_DEPT,
             hd.MOBILE,
-            hd.GROUP_NAME
+            hd.GROUP_NAME,
+            ei.EVENT_ID
         FROM
             epdc_issue_handle hd
+            left join epdc_issue ei on ei.ID = hd.ISSUE_ID
         WHERE
-            hd.DEL_FLAG = '0'
+            hd.DEL_FLAG = '0' and ei.DEL_FLAG = '0'
             AND hd.ISSUE_ID = #{issueId}
         ORDER BY
             hd.CREATED_TIME DESC
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml
index 0c5487ff..d2b427df 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-maintain/src/main/resources/mapper/item/ItemSummaryHandleProcessDao.xml
@@ -8,6 +8,7 @@
         <result property="advice" column="advice"/>
         <result property="handlerDept" column="handlerDept"/>
         <result property="state" column="STATE"/>
+        <result property="issueId" column="ISSUE_ID"/>
     </resultMap>
     <select id="selectListOfItemsHandle" resultMap="itemHandleMapByWork">
         SELECT
@@ -15,11 +16,13 @@
         hp.CREATED_TIME AS createdTime,
         hp.HANDLE_ADVICE AS advice,
         hp.HANDLER_DEPT AS handlerDept,
-        hp.STATE
+        hp.STATE,
+        ei.ISSUE_ID
         FROM
         epdc_item_handle_process hp
+        left join epdc_item ei on ei.ID = hp.ITEM_ID
         WHERE
-        hp.DEL_FLAG = '0'
+        hp.DEL_FLAG = '0' and ei.DEL_FLAG = '0'
         AND hp.ITEM_ID = #{itemId}
         ORDER BY
         createdTime DESC