Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/AllProjectFormDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.dataaggre.dto.govproject.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/12/25 14:46
+ */
+@NoArgsConstructor
+@Data
+public class AllProjectFormDTO implements Serializable {
+
+	private static final long serialVersionUID = -8515172319313536407L;
+	/**
+	 * 排序方式
+	 */
+	private String sortType;
+	/**
+	 * 项目状态(处理中:pending  已结案:closed)
+	 */
+	private String projectStatus;
+	/**
+	 * 排序方式
+	 */
+	private Integer pageNo = 1;
+	/**
+	 * 排序方式
+	 */
+	private Integer pageSize = 20;
+	/**
+	 * 网格ID集合
+	 */
+	private List<String> gridIdList;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectInfoDTO.java

@@ -0,0 +1,59 @@
+package com.epmet.dataaggre.dto.govproject.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/12/25 15:03
+ */
+@NoArgsConstructor
+@Data
+public class ProjectInfoDTO implements Serializable {
+
+	private static final long serialVersionUID = 3217246702883400582L;
+	/**
+	 * 项目ID
+	 */
+	private String projectId;
+	/**
+	 * 项目标题
+	 */
+	private String projectTitle;
+	/**
+	 * 项目创建时间
+	 */
+	private Long projectTime;
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
+	/**
+	 * 项目状态
+	 */
+	private String projectStatus;
+	/**
+	 * 项目更新时间
+	 */
+	private Long updateTime;
+	/**
+	 * 涉及部门数
+	 */
+	private Integer departmentCount;
+	/**
+	 * 消耗时长
+	 */
+	private Integer timeSpent;
+	/**
+	 * 处理次数
+	 */
+	private Integer processCount;
+	/**
+	 * 当前处理部门
+	 */
+	private List<String> currentDisposeDept;
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovIssueController.java

@@ -8,6 +8,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @DateTime 2020/12/25 上午9:45
  */
 @RestController
-@RequestMapping("govissue")
+@RequestMapping("issue")
 public class GovIssueController {
 }