|
|
@ -998,14 +998,15 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit |
|
|
|
//2.查询事件回复信息
|
|
|
|
LinkedList<IcEventProcessListResultDTO> event = icEventReplyService.getByEventId(formDTO.getIcEventId()); |
|
|
|
|
|
|
|
|
|
|
|
//3.判断查询事件项目进展或需求进展信息
|
|
|
|
//项目进展
|
|
|
|
if ("1".equals(entity.getOperationType())) { |
|
|
|
ProcessListV2FormDTO processListV2FormDTO = new ProcessListV2FormDTO(); |
|
|
|
processListV2FormDTO.setProjectId(entity.getOperationId()); |
|
|
|
List<ProcessListV2ResultDTO> project = projectTraceService.processListV2(processListV2FormDTO); |
|
|
|
resultList.addAll(ConvertUtils.sourceToTarget(project, IcEventProcessListResultDTO.class)); |
|
|
|
List<IcEventProcessListResultDTO> projectList = ConvertUtils.sourceToTarget(project, IcEventProcessListResultDTO.class); |
|
|
|
projectList.forEach(p->p.setType("project")); |
|
|
|
resultList.addAll(projectList); |
|
|
|
} |
|
|
|
//需求进展
|
|
|
|
if ("2".equals(entity.getOperationType())) { |
|
|
|