项目相关接口

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectListFromDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/13 16:14
+ */
+@Data
+public class ShiftProjectListFromDTO implements Serializable {
+
+	private static final long serialVersionUID = -1132054225167531812L;
+	/**
+	 * 网格Id
+	 */
+	private String gridId;
+	/**
+	 * 当前页
+	 */
+	private Integer pageNo;
+	/**
+	 * 每页记录数
+	 */
+	private Integer pageSize;
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ShiftProjectListResultDTO.java

@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/13 16:16
+ */
+@Data
+public class ShiftProjectListResultDTO implements Serializable {
+	private static final long serialVersionUID = -8616067919204282328L;
+	/**
+	 * 议题Id
+	 */
+	private String issueId;
+	/**
+	 * 议题标题
+	 */
+	private String issueTitle;
+	/**
+	 * 转成项目时间
+	 */
+	private Long shiftedTime;
+	/**
+	 * 项目状态
+	 */
+	private String projectStatus;
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
+	/**
+	 * 当前处理部门
+	 */
+	private List<String> departmentNameList;
+
+}

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -78,6 +78,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-project-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@@ -2,8 +2,10 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.form.ShiftProjectListFromDTO;
 import com.epmet.dto.result.GridVotingIssueCountResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.dto.result.ShiftProjectListResultDTO;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,5 +50,17 @@ public class IssueController {
         List<GridVotingIssueCountResultDTO> list = issueService.queryVotingIssueCount(gridIdList);
         return new Result<List<GridVotingIssueCountResultDTO>>().ok(list);
     }
+
+    /**
+     * 已转项目列表
+     * @author zhaoqifeng
+     * @date 2020/5/13 16:22
+     * @param fromDTO 参数
+     * @return java.util.List<com.epmet.dto.result.ShiftProjectListResultDTO>
+     */
+    @PostMapping("shiftprojectlist")
+    public Result<List<ShiftProjectListResultDTO>> getShiftProjectList(@RequestBody ShiftProjectListFromDTO fromDTO) {
+        return new Result<List<ShiftProjectListResultDTO>>().ok(issueService.getShiftProjectList(fromDTO));
+    }
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java

@@ -6,8 +6,12 @@ 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.CloseIssueFormDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
+import com.epmet.dto.form.ShiftProjectListFromDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
+import com.epmet.dto.result.ShiftProjectListResultDTO;
 import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.service.IssueService;
@@ -61,6 +65,19 @@ public class IssueManageController {
         return new Result<DepartmentStaffListResultDTO>().ok(issueService.departmentStaffList(formDTO));
     }
 
+    /**
+     * 已转项目列表
+     * @author zhaoqifeng
+     * @date 2020/5/13 16:22
+     * @param fromDTO 参数
+     * @return java.util.List<com.epmet.dto.result.ShiftProjectListResultDTO>
+     */
+    @PostMapping("shiftprojectlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFTED_PROJECT_LIST)
+    public Result<List<ShiftProjectListResultDTO>> getShiftProjectList(@RequestBody ShiftProjectListFromDTO fromDTO) {
+        return new Result<List<ShiftProjectListResultDTO>>().ok(issueService.getShiftProjectList(fromDTO));
+    }
+
     /**
      * @Description  详情折线图
      * @param issueId

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -19,10 +19,13 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.form.ShiftProjectListFromDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 议题详情 关联话题，转议题时间必须要和话题转议题时间一致、关闭时间必须要和操作记录表的关闭记录时间一致、转项目时间必须要和项目记录生成时间一致，注意服务间调用的时间一致性。每个议题最后总会被关闭。
  *
@@ -40,4 +43,13 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      */
     IssueResultDTO issueDetail(IssueDetailFormDTO formDTO);
 
+    /**
+     * 根据网格ID查找已转项目议题列表
+     * @author zhaoqifeng
+     * @date 2020/5/13 16:27
+     * @param fromDTO 参数
+     * @return java.util.List<com.epmet.entity.IssueEntity>
+     */
+    List<IssueEntity> selectIssueListByGridId(ShiftProjectListFromDTO fromDTO);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java

@@ -0,0 +1,30 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ShiftProjectsFromDTO;
+import com.epmet.dto.result.ShiftProjectResultDTO;
+import com.epmet.feign.fallback.GovProjectFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/14 13:26
+ */
+@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class)
+public interface GovProjectFeignClient {
+	/**
+	 * 根据议题查询项目
+	 * @author zhaoqifeng
+	 * @date 2020/5/13 16:55
+	 * @param fromDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.ProjectDTO>>
+	 */
+	@PostMapping("/gov/project/project/shiftprojectlist")
+	Result<List<ShiftProjectResultDTO>> getProjectByIssue(@RequestBody ShiftProjectsFromDTO fromDTO);
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java

@@ -0,0 +1,24 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ShiftProjectsFromDTO;
+import com.epmet.dto.result.ShiftProjectResultDTO;
+import com.epmet.feign.GovProjectFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/14 13:26
+ */
+@Component
+public class GovProjectFeignClientFallBack implements GovProjectFeignClient {
+	@Override
+	public Result<List<ShiftProjectResultDTO>> getProjectByIssue(ShiftProjectsFromDTO fromDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getProjectByIssue", fromDTO);
+	}
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -4,9 +4,11 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.CloseIssueFormDTO;
 import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.form.ShiftProjectListFromDTO;
 import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.GridVotingIssueCountResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
+import com.epmet.dto.result.ShiftProjectListResultDTO;
 import com.epmet.entity.IssueEntity;
 
 import java.util.List;
@@ -40,6 +42,15 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @Description 议题管理-部门人员选择
      **/
     DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO);
+
+    /**
+     * 已转项目议题列表
+     * @author zhaoqifeng
+     * @date 2020/5/13 16:22
+     * @param fromDTO 参数
+     * @return java.util.List<com.epmet.dto.result.ShiftProjectListResultDTO>
+     */
+    List<ShiftProjectListResultDTO> getShiftProjectList(ShiftProjectListFromDTO fromDTO);
     /**
      * @param gridIdList
      * @return java.util.List<com.epmet.dto.result.GridVotingIssueCountResultDTO>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -10,17 +10,13 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueProcessDao;
-import com.epmet.dto.form.CloseIssueFormDTO;
+import com.epmet.dto.ProjectDTO;
-import com.epmet.dto.form.DepartmentStaffListFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.dto.result.AgencyGridResultDTO;
-import com.epmet.dto.result.DepartmentStaffListResultDTO;
-import com.epmet.dto.result.GridVotingIssueCountResultDTO;
-import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueProcessEntity;
 import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.GovProjectFeignClient;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.redis.GovIssueRedis;
@@ -33,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author zxc
@@ -53,10 +50,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 	private MessageFeignClient messageFeignClient;
 	@Autowired
 	private GovIssueRedis govIssueRedis;
+	@Autowired
+	private GovProjectFeignClient govProjectFeignClient;
 
 	/**
-     * @Description  议题详情
 	 * @param issueDetail
+	 * @Description 议题详情
 	 * @author zxc
 	 * @date 2020/5/11 10:04
 	 */
@@ -169,4 +168,32 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 		Result<DepartmentStaffListResultDTO> resultDTOResult = govOrgFeignClient.departmentStaffList(formDTO.getAgencyId());
 		return resultDTOResult.getData();
 	}
+
+	@Override
+	public List<ShiftProjectListResultDTO> getShiftProjectList(ShiftProjectListFromDTO fromDTO) {
+		List<ShiftProjectListResultDTO> resultList = new ArrayList<>();
+		//查询条件
+		int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
+		fromDTO.setPageNo(pageIndex);
+		List<IssueEntity> issueList = baseDao.selectIssueListByGridId(fromDTO);
+		if (null == issueList || issueList.size() == 0) {
+			return resultList;
+		}
+		//遍历获取所有的userId
+		List<String> issueIds = issueList.stream().map(IssueEntity::getId).collect(Collectors.toList());
+		ShiftProjectsFromDTO shiftProjectsFromDTO = new ShiftProjectsFromDTO();
+		shiftProjectsFromDTO.setIssueIds(issueIds);
+		List<ShiftProjectResultDTO> projectList = govProjectFeignClient.getProjectByIssue(shiftProjectsFromDTO).getData();
+        resultList = issueList.stream().flatMap(issue -> projectList.stream().filter(p -> issue.getId().equals(p.getOriginId())).map(project ->{
+            ShiftProjectListResultDTO shiftProject = new ShiftProjectListResultDTO();
+            shiftProject.setIssueId(issue.getId());
+            shiftProject.setIssueTitle(issue.getIssueTitle());
+            shiftProject.setDepartmentNameList(project.getDepartmentNameList());
+            shiftProject.setPublicReply(project.getPublicReply());
+            shiftProject.setShiftedTime(project.getCreatedTime().getTime());
+            shiftProject.setProjectStatus(project.getStatus());
+            return shiftProject;
+        })).collect(Collectors.toList());
+		return resultList;
+	}
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -44,4 +44,15 @@
             AND del_flag = 0
     </select>
 
+    <select id="selectIssueListByGridId" parameterType="com.epmet.dto.form.ShiftProjectListFromDTO" resultType="com.epmet.entity.IssueEntity">
+        SELECT
+            *
+        FROM
+            issue
+        WHERE
+            DEL_FLAG = '0'
+        AND GRID_ID = #{gridId}
+        AND ISSUE_STATUS = 'shift_project'
+    </select>
+
 </mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ShiftProjectsFromDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/13 16:47
+ */
+@Data
+public class ShiftProjectsFromDTO implements Serializable {
+	private static final long serialVersionUID = 3832656052193286163L;
+	/**
+	 * 议题ID
+	 */
+	List<String> issueIds;
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ShiftProjectResultDTO.java

@@ -0,0 +1,53 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/5/14 13:45
+ */
+@Data
+public class ShiftProjectResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 4807330131467747264L;
+	/**
+	 * 唯一标识
+	 */
+	private String id;
+
+	/**
+	 * 来源ID
+	 */
+	private String originId;
+
+	/**
+	 * 项目标题
+	 */
+	private String title;
+
+	/**
+	 * 状态:待处理 pending，结案closed
+	 */
+	private String status;
+
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createdTime;
+
+	/**
+	 * 当前处理部门
+	 */
+	private List<String> departmentNameList;
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java

@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.ShiftProjectsFromDTO;
+import com.epmet.dto.result.ShiftProjectResultDTO;
 import com.epmet.excel.ProjectExcel;
 import com.epmet.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,17 @@ public class ProjectController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectExcel.class);
     }
 
+    /**
+     * 根据议题查询项目
+     * @author zhaoqifeng
+     * @date 2020/5/13 16:55
+     * @param fromDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.ProjectDTO>>
+     */
+    @PostMapping("shiftprojectlist")
+    public Result<List<ShiftProjectResultDTO>> getProjectByIssue(@RequestBody ShiftProjectsFromDTO fromDTO) {
+        List<ShiftProjectResultDTO> list = projectService.getProjectByIssue(fromDTO);
+        return new Result<List<ShiftProjectResultDTO>>().ok(list);
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java

@@ -12,6 +12,7 @@ import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectSatisfactionDetailService;
 import com.epmet.service.ProjectStaffService;
 import com.epmet.service.ProjectTraceService;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -51,6 +52,7 @@ public class ProjectTraceController {
 	 * @date 2020/5/11 16:14
 	 */
 	@PostMapping("pendprojectlist")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_PENDING_LIST)
 	public Result<List<PendProjectListResultDTO>> getPendProjectList(@LoginUser TokenDto tokenDto, @RequestBody ProjectListFromDTO fromDTO) {
 		List<PendProjectListResultDTO> result = projectTraceService.getPendProjectList(tokenDto, fromDTO);
 		return new Result<List<PendProjectListResultDTO>>().ok(result);
@@ -66,6 +68,7 @@ public class ProjectTraceController {
 	 * @date 2020/5/11 16:19
 	 */
 	@PostMapping("createdlist")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_CREATED_LIST)
 	public Result<List<CreatedListResultDTO>> getCreatedList(@LoginUser TokenDto tokenDto, @RequestBody ProjectListFromDTO fromDTO) {
 		List<CreatedListResultDTO> result = projectTraceService.getCreatedList(tokenDto, fromDTO);
 		return new Result<List<CreatedListResultDTO>>().ok(result);
@@ -81,6 +84,7 @@ public class ProjectTraceController {
 	 * @date 2020/5/11 16:21
 	 */
 	@PostMapping("involvedlist")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_INVOLVED_LIST)
 	public Result<List<InvolvedListResultDTO>> getInvolvedList(@LoginUser TokenDto tokenDto, @RequestBody ProjectListFromDTO fromDTO) {
 		List<InvolvedListResultDTO> result = projectTraceService.getInvolvedList(tokenDto, fromDTO);
 		return new Result<List<InvolvedListResultDTO>>().ok(result);
@@ -96,6 +100,7 @@ public class ProjectTraceController {
 	 * @date 2020/5/11 16:25
 	 */
 	@PostMapping("projectdetail")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_DETAIL)
 	public Result<ProjectDetailResultDTO> getProjectDetail(@LoginUser TokenDto tokenDto, @RequestBody ProjectDetailFromDTO fromDTO) {
 		ProjectDetailResultDTO result = projectTraceService.getProjectDetail(tokenDto, fromDTO);
 		return new Result<ProjectDetailResultDTO>().ok(result);
@@ -111,6 +116,7 @@ public class ProjectTraceController {
 	 * @date 2020/5/11 16:27
 	 */
 	@PostMapping("closeproject")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_CLOSE)
 	public Result closed(@LoginUser TokenDto tokenDto, @RequestBody ProjectClosedFromDTO fromDTO) {
 		projectTraceService.closed(tokenDto, fromDTO);
 		return new Result();
@@ -125,6 +131,7 @@ public class ProjectTraceController {
 	 * @date 2020/5/11 16:30
 	 */
 	@PostMapping("returnablelist")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_RETURN)
 	public Result<List<ReturnListResultDTO>> getReturnableList(@RequestBody ReturnListFromDTO fromDTO) {
 		List<ReturnListResultDTO> result = projectTraceService.getReturnableList(fromDTO);
 		return new Result<List<ReturnListResultDTO>>().ok(result);
@@ -140,6 +147,7 @@ public class ProjectTraceController {
 	 * @date 2020/5/11 16:32
 	 */
 	@PostMapping("return")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_RETURN)
 	public Result projectReturn(@LoginUser TokenDto tokenDto, @RequestBody ReturnFromDTO fromDTO) {
 		projectTraceService.projectReturn(tokenDto, fromDTO);
 		return new Result();
@@ -197,5 +205,19 @@ public class ProjectTraceController {
 		projectProcessService.transfer(formDTO);
 		return new Result();
 	}
+
+	/**
+	 * 我的处理部门
+	 * @author zhaoqifeng
+	 * @date 2020/5/14 14:22
+	 * @param tokenDto
+	 * @param fromDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.DepartmentResultDTO>>
+	 */
+	@PostMapping("mydepartmentlist")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_DETAIL)
+	public Result<List<DepartmentResultDTO>> myDepartmentList(@LoginUser TokenDto tokenDto, @RequestBody ProjectDetailFromDTO fromDTO) {
+		return new Result<List<DepartmentResultDTO>>().ok(projectTraceService.myDepartmentList(tokenDto, fromDTO));
+	}
 }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -20,7 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.form.ProjectListFromDTO;
-import com.epmet.dto.result.DepartmentResultDTO;
+import com.epmet.dto.form.ShiftProjectsFromDTO;
 import com.epmet.dto.result.ProjectDetailResultDTO;
 import com.epmet.entity.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -85,4 +85,13 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 */
 	ProjectDetailResultDTO selectProjectDetail(@Param("id") String id);
 
+	/**
+	 * 根据议题ID获取项目列表
+	 * @author zhaoqifeng
+	 * @date 2020/5/13 17:01
+	 * @param fromDTO
+	 * @return java.util.List<com.epmet.dto.ProjectDTO>
+	 */
+	List<ProjectDTO> selectShiftProjectList(ShiftProjectsFromDTO fromDTO);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java

@@ -19,10 +19,13 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.ProjectDetailFromDTO;
 import com.epmet.dto.form.ReturnListFromDTO;
 import com.epmet.dto.form.TransferFormDTO;
+import com.epmet.dto.result.DepartmentResultDTO;
 import com.epmet.dto.result.ProcesslistResultDTO;
 import com.epmet.dto.result.ReturnListResultDTO;
 import com.epmet.entity.ProjectProcessEntity;
@@ -122,4 +125,5 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @Description 项目跟踪-转其他部门
      **/
     void transfer(TransferFormDTO formDTO);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@@ -21,14 +21,8 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ProjectDTO;
-import com.epmet.dto.form.ProjectClosedFromDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.ProjectDetailFromDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.form.ProjectListFromDTO;
-import com.epmet.dto.form.ReturnFromDTO;
-import com.epmet.dto.result.CreatedListResultDTO;
-import com.epmet.dto.result.InvolvedListResultDTO;
-import com.epmet.dto.result.PendProjectListResultDTO;
-import com.epmet.dto.result.ProjectDetailResultDTO;
 import com.epmet.entity.ProjectEntity;
 
 import java.util.List;
@@ -159,4 +153,13 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 * @return void
 	 */
 	void projectReturn(ReturnFromDTO fromDTO);
+
+	/**
+	 * 根据议题查询项目
+	 * @author zhaoqifeng
+	 * @date 2020/5/13 16:55
+	 * @param fromDTO
+	 * @return java.util.List<com.epmet.dto.ProjectDTO>
+	 */
+	List<ShiftProjectResultDTO> getProjectByIssue(ShiftProjectsFromDTO fromDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTraceService.java

@@ -88,4 +88,15 @@ public interface ProjectTraceService {
 	 * @date 2020/5/11 16:32
 	 */
 	void projectReturn(TokenDto tokenDto, ReturnFromDTO fromDTO);
+
+	/**
+	 * 我的处理部门
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO 入参
+	 * @return java.util.List<com.epmet.dto.result.DepartmentResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/5/14 14:24
+	 */
+	List<DepartmentResultDTO> myDepartmentList(TokenDto tokenDto, ProjectDetailFromDTO fromDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -296,6 +296,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void projectReturn(ReturnFromDTO fromDTO) {
 		//更新项目关联表
 		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
@@ -324,6 +325,19 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		//TODO 通知
 	}
 
+	@Override
+	public List<ShiftProjectResultDTO> getProjectByIssue(ShiftProjectsFromDTO fromDTO) {
+		List<ShiftProjectResultDTO> resultList = new ArrayList<>();
+		List<ProjectDTO> projectList = baseDao.selectShiftProjectList(fromDTO);
+		projectList.forEach(project -> {
+			ShiftProjectResultDTO shiftProject = ConvertUtils.sourceToTarget(project, ShiftProjectResultDTO.class);
+			List<String> departmentNameList = baseDao.selectDepartmentNameList(project);
+			shiftProject.setDepartmentNameList(departmentNameList);
+			resultList.add(shiftProject);
+		});
+		return resultList;
+	}
+
 	/**
 	 * 获取客户定制的可滞留天数
 	 *

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -1,10 +1,12 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.ProjectStaffDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
+import com.epmet.service.ProjectStaffService;
 import com.epmet.service.ProjectTraceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,6 +24,8 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 	private ProjectService projectService;
 	@Autowired
 	private ProjectProcessService projectProcessService;
+	@Autowired
+	private ProjectStaffService projectStaffService;
 
 	@Override
 	public List<PendProjectListResultDTO> getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
@@ -63,4 +67,13 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 		fromDTO.setUserId(tokenDto.getUserId());
 		projectService.projectReturn(fromDTO);
 	}
+
+	@Override
+	public List<DepartmentResultDTO> myDepartmentList(TokenDto tokenDto, ProjectDetailFromDTO fromDTO) {
+		fromDTO.setUserId(tokenDto.getUserId());
+		ProjectStaffDTO projectStaffDTO = new ProjectStaffDTO();
+		projectStaffDTO.setProjectId(fromDTO.getProjectId());
+		projectStaffDTO.setStaffId(fromDTO.getUserId());
+		return projectStaffService.getDepartmentNameList(projectStaffDTO);
+	}
 }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -134,6 +134,21 @@
         WHERE p.DEL_FLAG = '0'
             AND p.ID = #{id}
     </select>
+    <select id="selectShiftProjectList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ShiftProjectsFromDTO">
+        SELECT p.*, IFNULL(pp.PUBLIC_REPLY, "") AS PUBLIC_REPLY FROM project p
+        LEFT JOIN (SELECT PROJECT_ID,
+                          PUBLIC_REPLY
+                    FROM
+                         project_process
+                    WHERE DEL_FLAG = '0'
+                        AND OPERATION = 'close') pp ON p.ID = pp.PROJECT_ID
+        WHERE p.DEL_FLAG = '0'
+        AND p.ORIGIN = 'issue'
+        <foreach item="issueId" collection="issueIds" separator="OR" open="AND (" close=")" index="">
+            p.ORIGIN_ID = #{issueId}
+        </foreach>
+        ORDER BY CREATED_TIME ASC
+    </select>
 
 
 </mapper>

epmet-module/resi-hall/resi-hall-server/pom.xml

@@ -45,6 +45,12 @@
             <artifactId>feign-httpclient</artifactId>
             <version>10.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-issue-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

@@ -156,5 +156,16 @@ public class IssueController {
         return new Result<List<EvaluationListResultDTO>>().ok(issueService.projectEvaluationList(formDTO));
     }
 
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("shiftproject")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT)
+    public Result<List<ShiftProjectListResultDTO>> getShiftProjectList(@RequestBody ShiftProjectListFromDTO formDTO){
+        return new Result<List<ShiftProjectListResultDTO>>().ok(issueService.getShiftProjectList(formDTO));
+    }
+
 }
 

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java

@@ -1,6 +1,8 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -76,4 +78,14 @@ public interface GovIssueFeignClient {
     @PostMapping("/gov/issue/issuesatisfactiondetail/evaluationlist")
     Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO);
 
+    /**
+     * 已转项目列表
+     * @author zhaoqifeng
+     * @date 2020/5/13 16:22
+     * @param fromDTO 参数
+     * @return java.util.List<com.epmet.dto.result.ShiftProjectListResultDTO>
+     */
+    @PostMapping("/gov/issue/issue/shiftprojectlist")
+    Result<List<ShiftProjectListResultDTO>> getShiftProjectList(@RequestBody ShiftProjectListFromDTO fromDTO);
+
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java

@@ -52,4 +52,9 @@ public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
     public Result<List<EvaluationListResultDTO>> evaluationList(EvaluationListFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "evaluationList", formDTO);
     }
+
+    @Override
+    public Result<List<ShiftProjectListResultDTO>> getShiftProjectList(ShiftProjectListFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getShiftProjectList", fromDTO);
+    }
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java

@@ -95,4 +95,13 @@ public interface IssueService {
      */
     List<EvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO);
 
+    /**
+     * 已转项目列表
+     * @author zhaoqifeng
+     * @date 2020/5/14 14:11
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.ShiftProjectListResultDTO>
+     */
+    List<ShiftProjectListResultDTO> getShiftProjectList(ShiftProjectListFromDTO formDTO);
+
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -39,8 +39,8 @@ public class IssueServiceImpl implements IssueService {
     private GovProjectFeignClient govProjectFeignClient;
 
     /**
-     * @Description  议题详情
      * @param issueDetail
+     * @Description 议题详情
      * @author zxc
      * @date 2020/5/11 10:04
      */
@@ -91,8 +91,8 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  议题表决折线图
      * @param issueId
+     * @Description 议题表决折线图
      * @author zxc
      * @date 2020/5/12 8:49
      */
@@ -103,8 +103,8 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  支持议题
      * @param issueId
+     * @Description 支持议题
      * @author zxc
      */
     @Override
@@ -117,8 +117,8 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  反对议题
      * @param issueId
+     * @Description 反对议题
      * @author zxc
      */
     @Override
@@ -131,8 +131,8 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  表决中议题详情——支持、反对数
      * @param issueId
+     * @Description 表决中议题详情——支持、反对数
      * @author zxc
      */
     @Override
@@ -142,9 +142,9 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  满意度评价初始化——已关闭
      * @param tokenDto
      * @param issueId
+     * @Description 满意度评价初始化——已关闭
      * @author zxc
      */
     @Override
@@ -157,9 +157,9 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  满意度评价初始化——已转项目
      * @param tokenDto
      * @param projectId
+     * @Description 满意度评价初始化——已转项目
      * @author zxc
      */
     @Override
@@ -172,8 +172,8 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  提交满意度评价——已关闭
      * @param evaluateFormDTO
+     * @Description 提交满意度评价——已关闭
      * @author zxc
      */
     @Override
@@ -183,8 +183,8 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  提交满意度评价——已转项目
      * @param projectEvaluateFormDTO
+     * @Description 提交满意度评价——已转项目
      * @author zxc
      */
     @Override
@@ -194,8 +194,8 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  满意度评价列表——已关闭
      * @param formDTO
+     * @Description 满意度评价列表——已关闭
      * @author zxc
      */
     @Override
@@ -224,8 +224,8 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * @Description  满意度评价列表——已转项目
      * @param formDTO
+     * @Description 满意度评价列表——已转项目
      * @author zxc
      */
     @Override
@@ -251,4 +251,13 @@ public class IssueServiceImpl implements IssueService {
         })).collect(Collectors.toList());
         return resultList;
     }
+
+    @Override
+    public List<ShiftProjectListResultDTO> getShiftProjectList(ShiftProjectListFromDTO formDTO) {
+        List<ShiftProjectListResultDTO> resultList = govIssueFeignClient.getShiftProjectList(formDTO).getData();
+        if (null == resultList || resultList.size() == NumConstant.ZERO) {
+            return new ArrayList<>();
+        }
+        return resultList;
+    }
 }