diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/.gitkeep b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessListFormDTO.java
new file mode 100644
index 0000000000..ec88405a6e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessListFormDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 项目处理进展列表-接口入参
+ * @Author sun
+ */
+@Data
+public class ProcessListFormDTO implements Serializable {
+ private static final long serialVersionUID = 4859779755214502427L;
+
+ @NotBlank(message = "项目Id不能为空")
+ private String projectId;
+
+}
+
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/.gitkeep b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java
new file mode 100644
index 0000000000..d77367e075
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcesslistResultDTO.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 项目跟踪-项目处理进展列表-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class ProcesslistResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 项目Id
+ */
+ private String projectId = "";
+
+ /**
+ * 项目处理进展Id
+ */
+ private String processId = "";
+
+ /**
+ * 处理进展名称
+ */
+ private String processName = "";
+
+ /**
+ * 处理进展时间
+ */
+ private Long processTime;
+
+ /**
+ * 处理部门
+ */
+ private String departmentName = "";
+
+ /**
+ * 公开答复
+ */
+ private String publicReply = "";
+
+ /**
+ * 内部备注
+ */
+ private String internalRemark = "";
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
index 9a4329be26..6d7d98ba0f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
@@ -1,8 +1,22 @@
package com.epmet.controller;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.service.ProjectProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
* @Description 政府端-项目跟踪
* @Author yinzuomei
@@ -11,5 +25,21 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("trace")
public class ProjectTraceController {
+
+ @Autowired
+ private ProjectProcessService projectProcessService;
+
+ /**
+ * @param formDTO
+ * @return
+ * @Author sun
+ * @Description 项目跟踪-项目处理进展列表
+ **/
+ @PostMapping("processlist")
+ @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_DETAIL)
+ public Result> processList(@LoginUser TokenDto tokenDTO, @RequestBody ProcessListFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO);
+ return new Result>().ok(projectProcessService.progressList(formDTO));
+ }
}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
index 5472b13ba0..825918297a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
@@ -18,8 +18,12 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ProcesslistResultDTO;
import com.epmet.entity.ProjectProcessEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 项目处理进展表
@@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ProjectProcessDao extends BaseDao {
-
+
+ /**
+ * @param projectId
+ * @return
+ * @Author sun
+ * @Description 根据项目Id查询项目处理进展列表
+ **/
+ List getProcessListByProjectId(@Param("projectId") String projectId);
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
index b44896e261..ce4889776a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
@@ -20,6 +20,8 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.ProjectProcessDTO;
+import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.result.ProcesslistResultDTO;
import com.epmet.entity.ProjectProcessEntity;
import java.util.List;
@@ -92,4 +94,12 @@ public interface ProjectProcessService extends BaseService
* @date 2020-05-11
*/
void delete(String[] ids);
+
+ /**
+ * @param formDTO
+ * @return
+ * @Author sun
+ * @Description 项目跟踪-项目处理进展列表
+ **/
+ List progressList(ProcessListFormDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index 3d43b730eb..6c45ca75e9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -20,12 +20,16 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.ProjectProcessDao;
+import com.epmet.dao.ProjectStaffDao;
import com.epmet.dto.ProjectProcessDTO;
+import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.result.ProcesslistResultDTO;
import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.feign.GovOrgFeignClient;
import com.epmet.redis.ProjectProcessRedis;
import com.epmet.service.ProjectProcessService;
import org.apache.commons.lang3.StringUtils;
@@ -33,9 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 项目处理进展表
@@ -48,6 +50,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl page(Map params) {
@@ -101,4 +107,16 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl progressList(ProcessListFormDTO formDTO) {
+ //根据项目Id查询所有处理进展数据,按时间倒序
+ return baseDao.getProcessListByProjectId(formDTO.getProjectId());
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/.gitkeep b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
index 9350f107ea..a952540452 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
@@ -3,22 +3,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ SELECT
+ id AS "processId",
+ project_id AS "projectId",
+ operation_name AS "processName",
+ UNIX_TIMESTAMP(created_time) AS "processTime",
+ department_name AS "departmentName",
+ public_reply AS "publicReply",
+ internal_remark AS "internalRemark"
+ FROM
+ project_process
+ WHERE
+ del_flag = '0'
+ AND project_id = #{projectId}
+ ORDER BY created_time DESC
+
\ No newline at end of file