Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118

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;
 }

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());

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;
+
 }

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