From b4083861fd1720487f094822c6d533dd9cb99f92 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Fri, 17 Apr 2026 18:52:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/warning/WarningController.java | 21 +------------------
 .../resources/mapper/ReportProjectMapper.xml  |  5 ++++-
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/warning/WarningController.java b/src/main/java/com/biutag/supervision/controller/warning/WarningController.java
index d41b14f..7ce80b0 100644
--- a/src/main/java/com/biutag/supervision/controller/warning/WarningController.java
+++ b/src/main/java/com/biutag/supervision/controller/warning/WarningController.java
@@ -63,8 +63,6 @@ public class WarningController {
             new Page<>(queryParam.getCurrent(), queryParam.getSize()), wrapper, queryParam.getWarningState());
 
         page.getRecords().forEach(this::fillProjectData);
-        sortByLastWarningTime(page.getRecords());
-
         return Result.success(page);
     }
     /**
@@ -239,7 +237,7 @@ public class WarningController {
             wrapper.between(true, "p.archiving", queryParam.getEndDate().get(0), queryParam.getEndDate().get(1));
         }
 
-        wrapper.orderByAsc("p.warning_state").groupBy("p.id");
+        // wrapper.orderByAsc("p.warning_state").groupBy("p.id");
         return wrapper;
     }
 
@@ -253,11 +251,6 @@ public class WarningController {
         if (CollectionUtil.isNotEmpty(list)) {
             // 是否已下发问题
             s.setStateData(list.stream().anyMatch(x -> "1".equals(x.getFlowState())) ? "1" : "0");
-            // 最新预警时间
-            list.stream().filter(r -> r.getSupervisionTime() != null)
-                    .max((a, b) -> a.getSupervisionTime().compareTo(b.getSupervisionTime()))
-                    .ifPresent(r -> s.setLastWarningTime(r.getSupervisionTime()
-                            .format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))));
             // 预警问题数
             List<String> ids = list.stream().map(WarningRecord::getId).toList();
             s.setWarningContent(contentService.count(
@@ -281,17 +274,5 @@ public class WarningController {
         return depart.getShortName() + "/";
     }
 
-    /**
-     * 按最新预警时间倒序排列
-     */
-    private void sortByLastWarningTime(List<EntryWindowVo> list) {
-        list.sort((a, b) -> {
-            if (a.getLastWarningTime() == null && b.getLastWarningTime() == null) return 0;
-            if (a.getLastWarningTime() == null) return 1;
-            if (b.getLastWarningTime() == null) return -1;
-            return b.getLastWarningTime().compareTo(a.getLastWarningTime());
-        });
-    }
-
 
 }
diff --git a/src/main/resources/mapper/ReportProjectMapper.xml b/src/main/resources/mapper/ReportProjectMapper.xml
index 2725bbe..1ffd318 100644
--- a/src/main/resources/mapper/ReportProjectMapper.xml
+++ b/src/main/resources/mapper/ReportProjectMapper.xml
@@ -67,7 +67,8 @@
     <select id="queryPageWarning" resultType="com.biutag.supervision.pojo.vo.entryWindow.EntryWindowVo">
         SELECT
             p.*,
-            COUNT(wr.id) AS count
+            COUNT(wr.id) AS count,
+            MAX(wr.supervision_time) AS lastWarningTime
         FROM
             report_project p
                 LEFT JOIN
@@ -75,6 +76,8 @@
                 LEFT JOIN
             warning_record wr ON wr.report_id = p.id
             ${ew.getCustomSqlSegment}
+        GROUP BY p.id
+        ORDER BY p.warning_state asc,  lastWarningTime DESC
     </select>
 
     <select id="queryPageCondition" resultType="com.biutag.supervision.pojo.vo.statement.ConditionVo">