Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * create by: zhangfenghe
+ * description: 疫情防控-疫苗接种情况请求对象
+ * create time: 2021/8/11$ 21:00$
+ */
+@Data
+public class EpdcScreenEpidemicVaccinationStatisticsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1007443787006330567L;
+
+    /**
+     * 组织类型：街道：street_party，社区：community_party
+     */
+    private String typeKey;
+}

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/form/EpdcScreenItemListFormDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/8/23 18:43
+ */
+@Data
+public class EpdcScreenItemListFormDTO implements Serializable {
+    private static final long serialVersionUID = 9002139861797676107L;
+
+    /**
+     * 页码  -必传项
+     */
+    @NotNull(message = "页码 不能为空")
+    private Integer pageIndex;
+
+    /**
+     * 页容量  -必传项
+     */
+    @NotNull(message = "页容量 不能为空")
+    private Integer pageSize;
+}

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

@@ -12,6 +12,11 @@ import java.io.Serializable;
 public class EpdcScreenGridGovernanceItemDifficultResultDTO implements Serializable {
     private static final long serialVersionUID = 6811731619897514999L;
 
+    /**
+     * 项目ID
+     */
+    private String itemId;
+
     /**
      * 事件ID
      */

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/EpdcScreenItemListResultDTO.java

@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/8/23 18:44
+ */
+@Data
+public class EpdcScreenItemListResultDTO implements Serializable {
+    private static final long serialVersionUID = -2604744896996074330L;
+
+    /**
+     * 项目ID
+     */
+    private String id;
+
+    /**
+     * 项目内容
+     */
+    private String itemContent;
+
+    /**
+     * 纬度
+     */
+    private String issueLatitude;
+
+    /**
+     * 经度
+     */
+    private String issueLongitude;
+}