|
@ -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.查询事件回复信息
|
|
|