|
|
@ -137,13 +137,16 @@ public class ProjectTraceServiceImpl implements ProjectTraceService { |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<ProcessListV2ResultDTO> processListV2(ProcessListV2FormDTO formDTO) { |
|
|
|
// 查询项目进展列表
|
|
|
|
List<ProcessListV2ResultDTO> processList = projectProcessDao.selectProcessList(formDTO.getProjectId()); |
|
|
|
if (CollectionUtils.isEmpty(processList)){ |
|
|
|
log.warn(ProjectConstant.NOT_EXIST_PROJECT); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
// 查询进展附件列表
|
|
|
|
List<PublicAndInternalFileResultDTO> files = attachmentDao.selectAttachByProjectId(formDTO.getProjectId()); |
|
|
|
if (!CollectionUtils.isEmpty(files)){ |
|
|
|
// 内部附件和公开附件分组
|
|
|
|
Map<String, List<PublicAndInternalFileResultDTO>> groupByPlace = files.stream().collect(Collectors.groupingBy(PublicAndInternalFileResultDTO::getFilePlace)); |
|
|
|
List<PublicAndInternalFileResultDTO> publicFiles = groupByPlace.get(ProjectConstant.PUBLIC); |
|
|
|
if (!CollectionUtils.isEmpty(publicFiles)){ |
|
|
|