Browse Source

事件处理进展没完事呢

dev
yinzuomei 3 years ago
parent
commit
2a865b13ed
  1. 4
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
  2. 4
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
  3. 6
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

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

@ -417,6 +417,6 @@ public interface GovIssueOpenFeignClient {
* @param issueId * @param issueId
* @return * @return
*/ */
@PostMapping("/gov/issue/manage/progress") // @PostMapping("/gov/issue/manage/progress")
Result<List<ProcessListResultDTO>> queryIssueProcess(@RequestBody IssueIdFormDTO issueId); // Result<List<ProcessListResultDTO>> queryIssueProcess(@RequestBody IssueIdFormDTO issueId);
} }

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

@ -360,8 +360,8 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
* @param formDTO * @param formDTO
* @return * @return
*/ */
@Override /*@Override
public Result<List<ProcessListResultDTO>> queryIssueProcess(IssueIdFormDTO formDTO) { public Result<List<ProcessListResultDTO>> queryIssueProcess(IssueIdFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "processList", formDTO); return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "processList", formDTO);
} }*/
} }

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

@ -1256,8 +1256,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
LinkedList<IcEventProcessListResultDTO> demand = icEventOperationLogService.getByEventId(formDTO.getIcEventId()); LinkedList<IcEventProcessListResultDTO> demand = icEventOperationLogService.getByEventId(formDTO.getIcEventId());
resultList.addAll(demand); resultList.addAll(demand);
} else if ("3".equals(entity.getOperationType())) { } else if ("3".equals(entity.getOperationType())) {
// 议题处理进展 // 议题处理进展 有问题 todo
IssueIdFormDTO issueIdFormDTO = new IssueIdFormDTO(); /*IssueIdFormDTO issueIdFormDTO = new IssueIdFormDTO();
issueIdFormDTO.setIssueId(entity.getOperationId()); issueIdFormDTO.setIssueId(entity.getOperationId());
Result<List<ProcessListResultDTO>> issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO); Result<List<ProcessListResultDTO>> issueProcessRes = govIssueOpenFeignClient.queryIssueProcess(issueIdFormDTO);
if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData())){ if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData())){
@ -1271,7 +1271,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
eventProcess.setProcessTime(issueProcess.getProcessTime()); eventProcess.setProcessTime(issueProcess.getProcessTime());
eventProcess.setPublicReply(issueProcess.getProgressDesc()); eventProcess.setPublicReply(issueProcess.getProgressDesc());
resultList.add(eventProcess); resultList.add(eventProcess);
} }*/
} }
//最后拼上回复的!!!!!!!!!!!! //最后拼上回复的!!!!!!!!!!!!
//3.查询事件回复信息 //3.查询事件回复信息

Loading…
Cancel
Save