From 25ecbe93ebecba11ce1c35b8d5ea9f4caacb5b20 Mon Sep 17 00:00:00 2001
From: HAHA <1824278510@qq.com>
Date: Fri, 9 Sep 2022 02:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E8=AF=A6=E6=83=85=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=EF=BC=8C=E8=BF=9B=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/item/result/ItemDetailForPCEndResultDTO.java     | 2 ++
 .../epdc/modules/item/service/impl/ItemServiceImpl.java  | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java
index da1190bb1..32d776b01 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java
@@ -199,4 +199,6 @@ public class ItemDetailForPCEndResultDTO implements Serializable {
      */
     private String firstCategoryCode;
 
+
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index c052a6e11..d60875c4d 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -596,6 +596,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         // 详情
         ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id);
+        //获取项目基本信息
+        ItemEntity entity = this.selectById(id);
+        // 获取项目处理进度
+        List<ItemHandleProgressResultDTO> dtoList = baseDao.selectListOfItemHandleProgressByWork(id);
+        resultDTO.setHandleProgressResultDTOS(dtoList);
+        // 获取议题处理进度
+        List<IssueProgressResultDTO> issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId());
+        resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS);
+
 
         // 根据操作人部门，获取上一级部门ID
         Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId());