From 2f0b3236807e9f7cbdde0fc28904d84c79f38e46 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Wed, 3 Dec 2025 20:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safety/service/impl/HseSafetyInspectionServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
index 315f7aa3..7cd502d2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
@@ -198,7 +198,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
         if (CollUtil.isNotEmpty(teamMeetings)) {
             // 获取最新的班组列表
             List<HseTeamMeeting> topList = teamMeetings.stream()
-                .sorted(Comparator.comparing(HseTeamMeeting::getCreateTime).reversed())
+                .sorted(Comparator.comparing(HseTeamMeeting::getMeetingDate).reversed())
                 .limit(Optional.ofNullable(req.getPageSize()).orElse(20))
                 .toList();
             List<Long> teamIds = topList.stream().map(HseTeamMeeting::getTeamId).toList();
@@ -224,7 +224,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
             .eq(HseSafetyInspection::getProjectId, projectId)
             .list();
         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 -> !q.getStatus().equals(HseSafetyInspectionStatusEnum.INFORM.getValue()))
             .toList();
@@ -235,7 +235,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
         }).toList();
         List<HseSafetyInspectionGis> inspections = safetyInspectionList.stream()
 //            .filter(q -> "2".equals(q.getIsReply()))
-            .sorted(Comparator.comparing(HseSafetyInspection::getCreateTime).reversed())
+            .sorted(Comparator.comparing(HseSafetyInspection::getCheckTime).reversed())
             .toList()
             .stream().map(p -> {
                 HseSafetyInspectionGis gis = new HseSafetyInspectionGis();