From 010193f103474760b1399f57173f458dbbfcdea2 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 21 Nov 2019 15:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=A4=84=E7=90=86=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=8E=A5=E5=8F=A3=20init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/result/IssueProgressResultDTO.java  | 40 +++++++++++++++++++
 .../esua/epdc/modules/issue/dao/IssueDao.java | 11 +++++
 .../modules/issue/service/IssueService.java   | 11 +++++
 .../issue/service/impl/IssueServiceImpl.java  |  5 +++
 .../main/resources/mapper/issue/IssueDao.xml  | 25 ++++++++++++
 5 files changed, 92 insertions(+)
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java

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
new file mode 100644
index 000000000..659d762e2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
@@ -0,0 +1,40 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 议题处理进度（后台和工作端用）
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/21 15:08
+ */
+@Data
+public class IssueProgressResultDTO implements Serializable {
+    private static final long serialVersionUID = 2739821096656995025L;
+
+    /**
+     * 状态
+     */
+    private String state;
+    /**
+     * 时间
+     */
+    private String createdTime;
+    /**
+     * 意见
+     */
+    private String advice;
+    /**
+     * 操作人部门
+     */
+    private String handlerDept;
+
+    /**
+     * 处理图片
+     */
+    private List<String> images;
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
index 91b48cd3e..375501dae 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
@@ -158,4 +158,15 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * 工作端-议题详情
      */
     WorkIssueDetailResultDTO selectOneWorkIssueDetail(String issueId);
+
+    /**
+     *
+     * 议题处理进度(后台/工作端用)
+     *
+     * @params [issueId]
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO>
+     * @author liuchuang
+     * @since 2019/11/21 15:16
+     */
+    List<IssueProgressResultDTO> selectListIssueProgress(String issueId);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java
index 70508326c..7f3476dc4 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java
@@ -237,4 +237,15 @@ public interface IssueService extends BaseService<IssueEntity> {
      * 工作端-议题详情
      */
     WorkIssueDetailResultDTO selectOneWorkIssueDetail(String issueId);
+
+    /**
+     *
+     * 议题处理进度(后台/工作端用)
+     *
+     * @params [issueId]
+     * @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO>
+     * @author liuchuang
+     * @since 2019/11/21 15:16
+     */
+    List<IssueProgressResultDTO> listIssueProgress(String issueId);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
index b694223cb..cc2a9ea79 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
@@ -444,4 +444,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     public WorkIssueDetailResultDTO selectOneWorkIssueDetail(String issueId) {
         return baseDao.selectOneWorkIssueDetail(issueId);
     }
+
+    @Override
+    public List<IssueProgressResultDTO> listIssueProgress(String issueId) {
+        return baseDao.selectListIssueProgress(issueId);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index 2bc4690a2..5c3d9c64d 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -354,6 +354,31 @@
             CREATED_TIME DESC
     </select>
 
+    <resultMap id="issueProgressMap" type="com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO">
+        <result property="state" column="STATE"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="advice" column="ADVICE"/>
+        <result property="handlerDept" column="HANDLER_DEPT"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectListIssueProgress" resultMap="issueProgressMap">
+        SELECT
+            hd.STATE,
+            hd.CREATED_TIME,
+            hd.ADVICE,
+            hd.HANDLER_DEPT,
+            img.IMG_URL
+        FROM
+            epdc_issue_handle hd
+            LEFT JOIN epdc_img img ON hd.ID = img.REFERENCE_ID
+            AND img.DEL_FLAG = '0'
+        WHERE
+            hd.DEL_FLAG = '0'
+            AND hd.ISSUE_ID = #{issueId}
+    </select>
+
     <select id="selectOneIssueCategoryStatistics" resultType="com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO">
         SELECT
             COUNT( issue.ID ) AS issueNum,