yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决全周期档案中白蚁普查附件不显示问题

master
wany 2024-09-30 10:47:11 +08:00
parent d0d37cbb0d
commit 187dc7c743
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java
View File

@ -120,7 +120,7 @@ public class ProjectEventsService extends ServiceImpl<ProjectEventsMapper, Proje
List<ProjectEventsVo> list = new ArrayList<>();
list = queryData(page,list);
if (CollectionUtils.isNotEmpty(list)) {
fillFile(list);
fillFile(list.stream().filter(o->o.getType() != 6).collect(Collectors.toList()));
list = list.stream().sorted(Comparator.comparing(ProjectEventsVo::getEventsDate).reversed()).collect(Collectors.toList());
List<ProjectEventsVo> paginate = DataHandleUtil.paginate(list, page.getPageSo().getPageNumber(), page.getPageSo().getPageSize());
res.setRecords(paginate);
@ -208,7 +208,7 @@ public class ProjectEventsService extends ServiceImpl<ProjectEventsMapper, Proje
}
private void fillFile(List<ProjectEventsVo> list) {
List<String> ids = list.stream().filter(o->o.getType() != 6).map(ProjectEventsVo::getId).map(Objects::toString).collect(Collectors.toList());
List<String> ids = list.stream().map(ProjectEventsVo::getId).map(Objects::toString).collect(Collectors.toList());
List<FileAssociations> files = fileService.getFilesByIds(ids);
Map<String, List<FileAssociations>> map = files.stream().collect(Collectors.groupingBy(FileAssociations::getBusinessId));
for (ProjectEventsVo vo : list){