Merge remote-tracking branch 'origin/master'

shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/EventHandleListFormDto.java

@@ -0,0 +1,105 @@
+package com.elink.esua.epdc.gird.shibei.dto.form;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 时间处理进度信息
+ * @author: wangtong
+ * @create: 2021-01-05 14:11
+ **/
+public class EventHandleListFormDto implements Serializable {
+
+    private static final long serialVersionUID = 3860840167014372806L;
+
+    /**
+     * 操作时间
+     */
+    private String createdTime;
+
+    /**
+     *处理意见
+     */
+    private String advice;
+
+    /**
+     *处理部门
+     */
+    private String handlerDept;
+
+    /**
+     *操作状态
+     */
+    private String state;
+
+    /**
+     *被吹哨部门
+     */
+    private List<String> itemDeptDTOS;
+
+    /**
+     *处理图片
+     */
+    private List<String> images;
+
+    public String getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(String createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public String getAdvice() {
+        return advice;
+    }
+
+    public void setAdvice(String advice) {
+        this.advice = advice;
+    }
+
+    public String getHandlerDept() {
+        return handlerDept;
+    }
+
+    public void setHandlerDept(String handlerDept) {
+        this.handlerDept = handlerDept;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public List<String> getItemDeptDTOS() {
+        return itemDeptDTOS;
+    }
+
+    public void setItemDeptDTOS(List<String> itemDeptDTOS) {
+        this.itemDeptDTOS = itemDeptDTOS;
+    }
+
+    public List<String> getImages() {
+        return images;
+    }
+
+    public void setImages(List<String> images) {
+        this.images = images;
+    }
+
+    @Override
+    public String toString() {
+        return "EventHandleListFormDto{" +
+                "createdTime='" + createdTime + '\'' +
+                ", advice='" + advice + '\'' +
+                ", handlerDept='" + handlerDept + '\'' +
+                ", state='" + state + '\'' +
+                ", itemDeptDTOS=" + itemDeptDTOS +
+                ", images=" + images +
+                '}';
+    }
+}

shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/SendEventFormDto.java

@@ -82,6 +82,12 @@ public class SendEventFormDto implements Serializable {
     @JSONField(name = "SSSQ")
     private String SSSQ;
 
+    /**
+     *诉求联系人及联系方式
+     */
+    @JSONField(name = "SQLXR")
+    private String SQLXR;
+
     /**
      *事件地址
      */
@@ -112,6 +118,8 @@ public class SendEventFormDto implements Serializable {
     @JSONField(name = "IMAGES")
     private List<String> IMAGES;
 
+    private List<EventHandleListFormDto> handleList;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -244,12 +252,27 @@ public class SendEventFormDto implements Serializable {
         this.IMAGES = IMAGES;
     }
 
+    public String getSQLXR() {
+        return SQLXR;
+    }
+
+    public void setSQLXR(String SQLXR) {
+        this.SQLXR = SQLXR;
+    }
+
+    public List<EventHandleListFormDto> getHandleList() {
+        return handleList;
+    }
+
+    public void setHandleList(List<EventHandleListFormDto> handleList) {
+        this.handleList = handleList;
+    }
+
     @Override
     public String toString() {
         return "SendEventFormDto{" +
                 "SENDTYPE='" + SENDTYPE + '\'' +
                 ", SENDACTDEFID='" + SENDACTDEFID + '\'' +
-                ", UID='" + UID + '\'' +
                 ", SJLYU='" + SJLYU + '\'' +
                 ", SJDL='" + SJDL + '\'' +
                 ", SJXL='" + SJXL + '\'' +
@@ -258,11 +281,13 @@ public class SendEventFormDto implements Serializable {
                 ", SSQS='" + SSQS + '\'' +
                 ", SSJD='" + SSJD + '\'' +
                 ", SSSQ='" + SSSQ + '\'' +
+                ", SQLXR='" + SQLXR + '\'' +
                 ", SJDZ='" + SJDZ + '\'' +
                 ", SJMS='" + SJMS + '\'' +
-                ", XZB='" + XZB + '\'' +
-                ", YZB='" + YZB + '\'' +
+                ", XZB=" + XZB +
+                ", YZB=" + YZB +
                 ", IMAGES=" + IMAGES +
+                ", handleList=" + handleList +
                 '}';
     }
 }