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 implem // 详情 ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id); + //获取项目基本信息 + ItemEntity entity = this.selectById(id); + // 获取项目处理进度 + List dtoList = baseDao.selectListOfItemHandleProgressByWork(id); + resultDTO.setHandleProgressResultDTOS(dtoList); + // 获取议题处理进度 + List issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId()); + resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS); + // 根据操作人部门,获取上一级部门ID Result sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId());