diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java index 424003916..3a4ce8bd3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.dto.item.result; +import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import lombok.Data; import java.io.Serializable; @@ -56,6 +57,11 @@ public class ItemContentForPCEndResultDTO implements Serializable { * 项目处理进度 */ private List handleProgressResultDTOS; + /** + * 议题处理进度 + */ + private List issueProgressResultDTOS; + /** * 图片 */ 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 05d475f7c..6c191096c 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 @@ -1,5 +1,6 @@ package com.elink.esua.epdc.dto.item.result; +import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import lombok.Data; @@ -49,6 +50,11 @@ public class ItemDetailForPCEndResultDTO implements Serializable { * 项目处理进度 */ private List handleProgressResultDTOS; + /** + * 议题处理进度 + */ + private List issueProgressResultDTOS; + /** * 可处理操作 */ 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 736b765c4..d50068e14 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 @@ -40,6 +40,7 @@ import com.elink.esua.epdc.dto.MenuNoticeDTO; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; +import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemDeptDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; @@ -273,9 +274,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY: resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS); } + //获取项目基本信息 + ItemEntity entity = this.selectById(id); // 获取项目处理进度 - List dtoList = this.listOfItemHandleProgress(id, 0); + List dtoList = baseDao.selectListOfItemHandleProgressByWork(id); resultDTO.setHandleProgressResultDTOS(dtoList); + // 获取议题处理进度 + List issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId()); + resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS); + return resultDTO; } @@ -693,9 +700,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem public ItemContentForPCEndResultDTO getItemContentDetail(String itemId) { // 详情 ItemContentForPCEndResultDTO resultDTO = baseDao.selectItemContentForPCEnd(itemId); - // 处理进度 - List handleProgressResultDTOS = this.listOfItemHandleProgress(itemId, 0); + //获取项目基本信息 + ItemEntity entity = this.selectById(itemId); + // 获取项目处理进度 + List handleProgressResultDTOS = baseDao.selectListOfItemHandleProgressByWork(itemId); resultDTO.setHandleProgressResultDTOS(handleProgressResultDTOS); + // 获取议题处理进度 + List issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId()); + resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS); // 部门满意度评价 List deptEvaluateResultDTOS = itemEvaluateDeptService.listOfDeptEvaluateByItemId(itemId); resultDTO.setDeptEvaluateResultDTOS(deptEvaluateResultDTOS);