修改事件，增加处理流程表单参数

epmet-auth/src/main/java/com/epmet/AuthApplication.java

@@ -8,7 +8,6 @@
 
 package com.epmet;
 
-import com.taobao.dingtalk.spring.annotations.EnableDingTalk;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -21,7 +20,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@EnableDingTalk
+//@EnableDingTalk
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description 事件管理_回复
@@ -50,7 +51,27 @@ public class IcEventReplyFormDTO implements Serializable {
     @NotBlank(message = "满意度不能为空", groups = {Comment.class})
     private String satisfaction;
 
+    /**
+     * 办理状态：0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档
+     */
+    private Integer manageStatus;
+
+    /**
+     * 办理时间
+     */
+    private Date manageTime;
+
+    /**
+     * 办理人
+     */
+    private String manageResi;
+
+    /**
+     * 办理人电话
+     */
+    private String manageResiTel;
+
     private String customerId;
     private String userId;
 
-}
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -92,5 +93,25 @@ public class IcEventProcessListResultDTO implements Serializable {
      */
     private String actualServiceTime;
 
+    /**
+     * 办理状态：0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档
+     */
+    private Integer manageStatus;
+
+    /**
+     * 办理时间
+     */
+    private Date manageTime;
+
+    /**
+     * 办理人
+     */
+    private String manageResi;
+
+    /**
+     * 办理人电话
+     */
+    private String manageResiTel;
+
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java

@@ -61,6 +61,11 @@ public class IcEventEntity extends BaseEpmetEntity {
      */
 	private String idCard;
 
+	/**
+	 * 事件分类分类Id :灵山专用
+	 */
+	private String categoryId;
+
 	/**
 	 * 反映渠道【字典表】dictTypeKey:ic_event_source_type;随手拍随时讲0、多媒体反应1、社区电话2、12345:3、网格员手持终端：4
 	 */
@@ -117,7 +122,7 @@ public class IcEventEntity extends BaseEpmetEntity {
 	private Integer readFlag;
 
     /**
-     * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; 
+     * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1;
      */
 	private Integer redDot;
 
@@ -157,7 +162,7 @@ public class IcEventEntity extends BaseEpmetEntity {
 	private Date commentTime;
 
     /**
-     * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing； 
+     * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing；
 		auto_passed: 自动通过；
 		review：结果不确定，需要人工审核；
 		block: 结果违规；

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventReplyEntity.java

@@ -46,4 +46,24 @@ public class IcEventReplyEntity extends BaseEpmetEntity {
      */
 	private String userShowName;
 
+	/**
+	 * 办理状态：0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档
+	 */
+	private Integer manageStatus;
+
+	/**
+	 * 办理时间
+	 */
+	private Date manageTime;
+
+	/**
+	 * 办理人
+	 */
+	private String manageResi;
+
+	/**
+	 * 办理人电话
+	 */
+	private String manageResiTel;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -798,6 +798,10 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         replyEntity.setCustomerId(formDTO.getCustomerId());
         replyEntity.setIcEventId(formDTO.getIcEventId());
         replyEntity.setFromUserId(formDTO.getUserId());
+        replyEntity.setManageResi(formDTO.getManageResi());
+        replyEntity.setManageResiTel(formDTO.getManageResiTel());
+        replyEntity.setManageStatus(formDTO.getManageStatus());
+        replyEntity.setManageTime(formDTO.getManageTime());
         replyEntity.setContent(formDTO.getContent());
         replyEntity.setUserShowName(staffInfo.getAgencyName() + "-" + staffInfo.getRealName());
         icEventReplyService.insert(replyEntity);

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventReplyDao.xml

@@ -10,7 +10,11 @@
             '回复' processName,
             UNIX_TIMESTAMP(created_time) processTime,
             user_show_name departmentName,
-            content publicReply
+            content publicReply,
+            manage_status,
+            manage_time,
+            manage_resi,
+            manage_resi_tel
         FROM
             ic_event_reply
         WHERE
@@ -34,4 +38,4 @@
         ORDER BY
             r.CREATED_TIME DESC
     </select>
-</mapper>
+</mapper>