From c80419517b3b22cc3abf423f4eeb206bf726081d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 10 Oct 2022 11:22:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86=E8=BF=9B?=
 =?UTF-8?q?=E5=B1=95=E8=B0=83=E6=95=B4=EF=BC=9A=E6=9C=8D=E5=8A=A1+?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=9B=9E=E5=A4=8D=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=BF=9B=E5=B1=95+=E4=BA=8B=E4=BB=B6=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E3=80=81=E8=AE=AE=E9=A2=98=E8=BF=9B=E5=B1=95=EF=BC=88=E5=90=AB?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=89+=E4=BA=8B=E4=BB=B6=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcEventServiceImpl.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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 bcf82b4bf9..189811df46 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
@@ -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;