diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java index 05b17f9d57..394d617df8 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java +++ b/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 diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index bf3ce4bf2c..b2e939d9e9 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -413,10 +413,10 @@ public interface GovIssueOpenFeignClient { Result publishIssue(@RequestBody PublishIssueFormDTO issueFormDTO); /** - * 议题处理进展，这个接口小程序也在用，服务之间也在用 - * @param issueId + * 议题处理进展:(只包含发起议题、关闭议题) + * @param formDTO * @return */ - // @PostMapping("/gov/issue/manage/progress") - // Result> queryIssueProcess(@RequestBody IssueIdFormDTO issueId); + @PostMapping("/gov/issue/issueprocess/issueprocess") + Result queryIssueProcess(@RequestBody IssueIdFormDTO formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index f7c44e4a75..590afb6b41 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/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 - public Result> queryIssueProcess(IssueIdFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "processList", formDTO); - }*/ + @Override + public Result queryIssueProcess(IssueIdFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryIssueProcess", formDTO); + } + } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java index 7b4b805e7e..4379252a67 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java +++ b/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 */ diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index c86a871a8a..d4fd341b7f 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/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> batchSelectById(@RequestBody List icEventIds); + + /** + * @Description 议题处理进展——已转项目 + * @param formDTO + * @author zxc + */ + @PostMapping("/gov/project/projectprocess/projectprocesslist") + Result> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO); + } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java index 5854347118..bfb6d57f89 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java +++ b/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> batchSelectById(List icEventIds) { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "batchSelectById",icEventIds); } + + @Override + public Result> projectProcessList(ProcessProjectIdFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectProcessList", formDTO); + } + + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 7977e57971..c2d7aac1b3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/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 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> issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO); - if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData())){ + Result issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO); + 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 projectEntityList=SpringContextUtils.getBean(ProjectService.class).getByOriginId(issueAdvanceResDTO.getIssueId()); + if(!CollectionUtils.isEmpty(projectEntityList)){ + // 项目进展 + ProcessListV2FormDTO processListV2FormDTO = new ProcessListV2FormDTO(); + processListV2FormDTO.setProjectId(projectEntityList.get(0).getId()); + List project = projectTraceService.processListV2(processListV2FormDTO); + List 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.查询事件回复信息