Merge remote-tracking branch 'origin/master'

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeDTO.java

@@ -88,4 +88,9 @@ public class PartyOrgTypeDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 党组织类型图标
+     */
+	private String imgUrl;
+
 }

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenIssueProgressFormDTO.java

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/8/21 17:33
+ */
+@Data
+public class EpdcScreenIssueProgressFormDTO implements Serializable {
+    private static final long serialVersionUID = 1121062669001864971L;
+
+    @NotBlank(message = "ID不能为空")
+    private String id;
+
+    /**
+     * 0-项目ID，1-事件ID
+     */
+    @NotBlank(message = "ID标识不能为空")
+    private String idFlag;
+}

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenIssueProgressResultDTO.java

@@ -0,0 +1,55 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 议题处理进度（后台和工作端用）
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/21 15:08
+ */
+@Data
+public class EpdcScreenIssueProgressResultDTO implements Serializable {
+    private static final long serialVersionUID = 2739821096656995025L;
+
+    /**
+     * 处理进度ID
+     */
+    private String id;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+    /**
+     * 时间
+     */
+    private String createdTime;
+    /**
+     * 意见
+     */
+    private String advice;
+    /**
+     * 操作人部门
+     */
+    private String handlerDept;
+
+    /**
+     * 处理图片
+     */
+    private List<String> images;
+
+    /**
+     * 操作人电话
+     */
+    private String mobile;
+
+    /**
+     * 来源社群
+     */
+    private String groupName;
+}

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenItemInfoResultDTO.java

@@ -0,0 +1,18 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/8/21 17:42
+ */
+@Data
+public class EpdcScreenItemInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = 73133250156933500L;
+
+    private String id;
+    private String issueId;
+    private String eventId;
+}

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java

@@ -52,4 +52,9 @@ public class EpdcScreenPartyBuildingPartyOrgResultDTO implements Serializable {
      */
     private  String typeCode;
 
+    /**
+     *党组织类型图标
+     */
+    private  String imgUrl;
+
 }

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgTypeResultDTO.java

@@ -32,4 +32,9 @@ public class EpdcScreenPartyBuildingPartyOrgTypeResultDTO implements Serializabl
      */
     private String typeCode;
 
+    /**
+     *党组织类型图标
+     */
+    private  String imgUrl;
+
 }