事件处理进展调整：服务+事件回复、项目进展+事件回复、议题进展（含项目）+事件回复

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

@@ -1205,7 +1205,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件不存在","事件不存在");
         }
         // operationType 0:已回复 1:已转项目  2:已转需求3:转议题
-        //3.判断查询事件项目进展或需求进展信息
+        //2.判断查询事件项目进展或需求进展信息或者议题进展
         if ("1".equals(entity.getOperationType())) {
             // 项目进展
             ProcessListV2FormDTO processListV2FormDTO = new ProcessListV2FormDTO();
@@ -1226,12 +1226,18 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             if(!issueProcessRes.success()||CollectionUtils.isEmpty(issueProcessRes.getData())){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件已转议题，议题处理进展查询异常", "事件已转议题，议题处理进展查询异常");
             }
-            //    todo
-
-
+            for(ProcessListResultDTO issueProcess:issueProcessRes.getData()){
+                IcEventProcessListResultDTO eventProcess=new IcEventProcessListResultDTO();
+                eventProcess.setDepartmentName(issueProcess.getDepartmentName());
+                eventProcess.setProcessId(issueProcess.getProcessId());
+                eventProcess.setProcessName(issueProcess.getProcessName());
+                eventProcess.setProcessTime(issueProcess.getProcessTime());
+                eventProcess.setPublicReply(issueProcess.getProgressDesc());
+                resultList.add(eventProcess);
+            }
         }
-        //最后拼上回复的
-        //2.查询事件回复信息
+        //最后拼上回复的!!!!!!!!!!!!
+        //3.查询事件回复信息
         LinkedList<IcEventProcessListResultDTO> event = icEventReplyService.getByEventId(formDTO.getIcEventId());
         resultList.addAll(event);
         return resultList;