From 384feab2f43c52ecdc66fcd49546a297ef5f4bfb Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Wed, 27 Nov 2019 09:39:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8B=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86=E8=BF=9B=E5=BA=A6=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/issue/result/IssueProgressResultDTO.java  | 10 ++++++++++
 .../events/service/impl/EpdcEventsServiceImpl.java     |  1 +
 .../epdc/modules/issue/entity/IssueHandleEntity.java   |  5 +++++
 .../src/main/resources/mapper/issue/IssueDao.xml       |  4 ++++
 4 files changed, 20 insertions(+)

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 f57a6c1dd..722ba728e 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
@@ -42,4 +42,14 @@ public class IssueProgressResultDTO implements Serializable {
      * 处理图片
      */
     private List<String> images;
+
+    /**
+     * 操作人电话
+     */
+    private String mobile;
+
+    /**
+     * 来源社群
+     */
+    private String groupName;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index 002a06acb..6d256aa46 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -431,6 +431,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         issueHandleEntity.setIssueId(issueEntity.getId());
         issueHandleEntity.setState(NumConstant.THREE);
         issueHandleEntity.setAdvice(dto.getAdvice());
+        issueHandleEntity.setGroupName(dto.getGroupName());
         UserDetail user = SecurityUser.getUser();
         issueHandleEntity.setHandlerDeptId(user.getId());
         issueHandleEntity.setHandlerDept(user.getRealName());
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java
index d6924d240..f107284a0 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java
@@ -67,4 +67,9 @@ public class IssueHandleEntity extends BaseEpdcEntity {
 	 */
 	private String mobile;
 
+	/**
+	 * 来源社群
+	 */
+	private String groupName;
+
 }
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 e7935fa61..c689246b5 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
@@ -305,6 +305,8 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="advice" column="ADVICE"/>
         <result property="handlerDept" column="HANDLER_DEPT"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="groupName" column="GROUP_NAME"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -316,6 +318,8 @@
             hd.CREATED_TIME,
             hd.ADVICE,
             hd.HANDLER_DEPT,
+            hd.MOBILE,
+            hd.GROUP_NAME,
             img.IMG_URL
         FROM
             epdc_issue_handle hd