From f77706060c9d6808b45682c2e93660d4673b122b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 22 Dec 2020 09:51:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=B1=95V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ProjectTraceServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index 8ea152b030..ae7f5dbd8e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -137,13 +137,16 @@ public class ProjectTraceServiceImpl implements ProjectTraceService { */ @Override public List processListV2(ProcessListV2FormDTO formDTO) { + // 查询项目进展列表 List processList = projectProcessDao.selectProcessList(formDTO.getProjectId()); if (CollectionUtils.isEmpty(processList)){ log.warn(ProjectConstant.NOT_EXIST_PROJECT); return new ArrayList<>(); } + // 查询进展附件列表 List files = attachmentDao.selectAttachByProjectId(formDTO.getProjectId()); if (!CollectionUtils.isEmpty(files)){ + // 内部附件和公开附件分组 Map> groupByPlace = files.stream().collect(Collectors.groupingBy(PublicAndInternalFileResultDTO::getFilePlace)); List publicFiles = groupByPlace.get(ProjectConstant.PUBLIC); if (!CollectionUtils.isEmpty(publicFiles)){