lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

顺序

Browse Source
This commit is contained in:
zt
2025-12-03 20:18:34 +08:00
parent 35d2a10c0e
commit 2f0b323680
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
View File

@ -198,7 +198,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
if (CollUtil.isNotEmpty(teamMeetings)) { if (CollUtil.isNotEmpty(teamMeetings)) {
// 获取最新的班组列表 // 获取最新的班组列表
List<HseTeamMeeting> topList = teamMeetings.stream() List<HseTeamMeeting> topList = teamMeetings.stream()
.sorted(Comparator.comparing(HseTeamMeeting::getCreateTime).reversed()) .sorted(Comparator.comparing(HseTeamMeeting::getMeetingDate).reversed())
.limit(Optional.ofNullable(req.getPageSize()).orElse(20)) .limit(Optional.ofNullable(req.getPageSize()).orElse(20))
.toList(); .toList();
List<Long> teamIds = topList.stream().map(HseTeamMeeting::getTeamId).toList(); List<Long> teamIds = topList.stream().map(HseTeamMeeting::getTeamId).toList();
@ -224,7 +224,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
.eq(HseSafetyInspection::getProjectId, projectId) .eq(HseSafetyInspection::getProjectId, projectId)
.list(); .list();
List<HseSafetyInspection> passList = safetyInspectionList.stream() List<HseSafetyInspection> passList = safetyInspectionList.stream()
.sorted(Comparator.comparing(HseSafetyInspection::getCreateTime).reversed()) .sorted(Comparator.comparing(HseSafetyInspection::getCheckTime).reversed())
.filter(q -> "1".equals(q.getIsReply())) .filter(q -> "1".equals(q.getIsReply()))
.filter(q -> !q.getStatus().equals(HseSafetyInspectionStatusEnum.INFORM.getValue())) .filter(q -> !q.getStatus().equals(HseSafetyInspectionStatusEnum.INFORM.getValue()))
.toList(); .toList();
@ -235,7 +235,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
}).toList(); }).toList();
List<HseSafetyInspectionGis> inspections = safetyInspectionList.stream() List<HseSafetyInspectionGis> inspections = safetyInspectionList.stream()
// .filter(q -> "2".equals(q.getIsReply())) // .filter(q -> "2".equals(q.getIsReply()))
.sorted(Comparator.comparing(HseSafetyInspection::getCreateTime).reversed()) .sorted(Comparator.comparing(HseSafetyInspection::getCheckTime).reversed())
.toList() .toList()
.stream().map(p -> { .stream().map(p -> {
HseSafetyInspectionGis gis = new HseSafetyInspectionGis(); HseSafetyInspectionGis gis = new HseSafetyInspectionGis();