事件处理进展（事件-议题-转项目）

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

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * @Author zxc
+ * @Author zxc 就是他issue
  * 议题处理进展
  */
 @Data

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -413,10 +413,10 @@ public interface GovIssueOpenFeignClient {
 	Result<IssueDTO> publishIssue(@RequestBody PublishIssueFormDTO issueFormDTO);
 
 	/**
-	 * 议题处理进展，这个接口小程序也在用，服务之间也在用
+	 * 议题处理进展:(只包含发起议题、关闭议题)
-	 * @param issueId
+	 * @param formDTO
 	 * @return
 	 */
-	// @PostMapping("/gov/issue/manage/progress")
+	@PostMapping("/gov/issue/issueprocess/issueprocess")
-	// Result<List<ProcessListResultDTO>> queryIssueProcess(@RequestBody IssueIdFormDTO issueId);
+	Result<IssueAdvanceResDTO> queryIssueProcess(@RequestBody IssueIdFormDTO formDTO);
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -355,13 +355,14 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	}
 
 	/**
-	 * 议题处理进展，这个接口小程序也在用，服务之间也在用
+	 * 议题处理进展，(只包含发起议题、关闭议题)
 	 *
 	 * @param formDTO
 	 * @return
 	 */
-	/*@Override
+	@Override
-	public Result<List<ProcessListResultDTO>> queryIssueProcess(IssueIdFormDTO formDTO) {
+	public Result<IssueAdvanceResDTO> queryIssueProcess(IssueIdFormDTO formDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "processList", formDTO);
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryIssueProcess", formDTO);
-	}*/
+	}
+
 }

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

@@ -14,7 +14,7 @@ import java.util.List;
 public class IcEventProcessListResultDTO implements Serializable {
 
     private static final long serialVersionUID = 5762152044573235897L;
-
+    private String issueId;
     /**
      * 项目ID
      */

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -186,4 +186,13 @@ public interface GovProjectOpenFeignClient {
 	 */
 	@PostMapping("gov/project/icEvent/batchSelectById")
     Result<List<IcEventDTO>> batchSelectById(@RequestBody List<String> icEventIds);
+
+	/**
+	 * @Description  议题处理进展——已转项目
+	 * @param formDTO
+	 * @author zxc
+	 */
+	@PostMapping("/gov/project/projectprocess/projectprocesslist")
+	Result<List<ProjectProcessListResultDTO>> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO);
+
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java

@@ -186,4 +186,11 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli
 	public Result<List<IcEventDTO>> batchSelectById(List<String> icEventIds) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "batchSelectById",icEventIds);
 	}
+
+	@Override
+	public Result<List<ProjectProcessListResultDTO>> projectProcessList(ProcessProjectIdFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectProcessList", formDTO);
+	}
+
+
 }

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

@@ -1257,22 +1257,38 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             LinkedList<IcEventProcessListResultDTO> demand = icEventOperationLogService.getByEventId(formDTO.getIcEventId());
             resultList.addAll(demand);
         } else if ("3".equals(entity.getOperationType())) {
-            // 议题处理进展 有问题 todo
+            // 议题处理进展
-            /*IssueIdFormDTO issueIdFormDTO = new IssueIdFormDTO();
+            IssueIdFormDTO issueIdFormDTO = new IssueIdFormDTO();
             issueIdFormDTO.setIssueId(entity.getOperationId());
-            Result<List<ProcessListResultDTO>> issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO);
+            Result<IssueAdvanceResDTO> issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO);
-            if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData())){
+            if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData().getProcessList())){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件已转议题，议题处理进展查询异常", "事件已转议题，议题处理进展查询异常");
             }
-            for(ProcessListResultDTO issueProcess:issueProcessRes.getData()){
+            IssueAdvanceResDTO issueAdvanceResDTO=issueProcessRes.getData();
+            //如果议题已转项目，先放项目的处理进展
+            if("shift_project".equals(issueAdvanceResDTO.getIssueStatus())){
+                //根据议题id查询项目
+                List<ProjectEntity> projectEntityList=SpringContextUtils.getBean(ProjectService.class).getByOriginId(issueAdvanceResDTO.getIssueId());
+                if(!CollectionUtils.isEmpty(projectEntityList)){
+                    // 项目进展
+                    ProcessListV2FormDTO processListV2FormDTO = new ProcessListV2FormDTO();
+                    processListV2FormDTO.setProjectId(projectEntityList.get(0).getId());
+                    List<ProcessListV2ResultDTO> project = projectTraceService.processListV2(processListV2FormDTO);
+                    List<IcEventProcessListResultDTO> projectList = ConvertUtils.sourceToTarget(project, IcEventProcessListResultDTO.class);
+                    projectList.forEach(p -> p.setType("project"));
+                    resultList.addAll(projectList);
+                }
+            }
+            for(ProcessListResultDTOBak issueProcess:issueAdvanceResDTO.getProcessList()){
                 IcEventProcessListResultDTO eventProcess=new IcEventProcessListResultDTO();
                 eventProcess.setDepartmentName(issueProcess.getDepartmentName());
                 eventProcess.setProcessId(issueProcess.getProcessId());
                 eventProcess.setProcessName(issueProcess.getProcessName());
                 eventProcess.setProcessTime(issueProcess.getProcessTime());
                 eventProcess.setPublicReply(issueProcess.getProgressDesc());
+                eventProcess.setIssueId(issueAdvanceResDTO.getIssueId());
                 resultList.add(eventProcess);
-            }*/
+            }
         }
         //最后拼上回复的!!!!!!!!!!!!
         //3.查询事件回复信息