From 9e728237cde66e43c3726f83b83aa97ae8151576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E5=BA=8F=E6=8C=AF?= <luxuzhen@inspur.com>
Date: Mon, 26 Aug 2024 16:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fastPassage/SpqListLibraryMapper.xml      |  1 +
 .../fastPassage/SpqTrafficRecordsMapper.xml   |  1 +
 .../spqDangerMonitor/SpqAlarmOrderMapper.xml  | 31 +++++++++++++------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/God-Vue-master/god-system/src/main/resources/mapper/fastPassage/SpqListLibraryMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/fastPassage/SpqListLibraryMapper.xml
index e7413382..0cdee04f 100644
--- a/God-Vue-master/god-system/src/main/resources/mapper/fastPassage/SpqListLibraryMapper.xml
+++ b/God-Vue-master/god-system/src/main/resources/mapper/fastPassage/SpqListLibraryMapper.xml
@@ -37,6 +37,7 @@
             <if test="periodValidity != null  and periodValidity != ''"> and period_validity =
             #{periodValidity}</if>
         </where>
+        ORDER BY date_time desc
     </select>
 
     <select id="selectSpqListLibraryById" parameterType="String" resultMap="SpqListLibraryResult">
diff --git a/God-Vue-master/god-system/src/main/resources/mapper/fastPassage/SpqTrafficRecordsMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/fastPassage/SpqTrafficRecordsMapper.xml
index 36498f7c..3b21c3e9 100644
--- a/God-Vue-master/god-system/src/main/resources/mapper/fastPassage/SpqTrafficRecordsMapper.xml
+++ b/God-Vue-master/god-system/src/main/resources/mapper/fastPassage/SpqTrafficRecordsMapper.xml
@@ -35,6 +35,7 @@
             <if test="region != null  and region != ''"> and region =
             #{region}</if>
         </where>
+        ORDER BY times desc
     </select>
 
     <select id="selectSpqTrafficRecordsById" parameterType="String" resultMap="SpqTrafficRecordsResult">
diff --git a/God-Vue-master/god-system/src/main/resources/mapper/spqDangerMonitor/SpqAlarmOrderMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/spqDangerMonitor/SpqAlarmOrderMapper.xml
index e96697ff..11ca524e 100644
--- a/God-Vue-master/god-system/src/main/resources/mapper/spqDangerMonitor/SpqAlarmOrderMapper.xml
+++ b/God-Vue-master/god-system/src/main/resources/mapper/spqDangerMonitor/SpqAlarmOrderMapper.xml
@@ -24,17 +24,29 @@
     <select id="selectSpqAlarmOrderList" parameterType="SpqAlarmOrder" resultMap="SpqAlarmOrderResult">
         <include refid="selectSpqAlarmOrderVo"/>
         <where>
-            <if test="dangerScene != null  and dangerScene != ''">and danger_scene = #{dangerScene}</if>
-            <if test="imgId != null  and imgId != ''">and img_id = #{imgId}</if>
-            <if test="alarmTime != null  and alarmTime != ''">and alarm_time = #{alarmTime}</if>
-            <if test="sceneAddress != null  and sceneAddress != ''">and scene_address = #{sceneAddress}</if>
-            <if test="alarmDesc != null  and alarmDesc != ''">and alarm_desc = #{alarmDesc}</if>
-            <if test="orderId != null  and orderId != ''">and order_id like concat('%', #{orderId}, '%')</if>
-            <if test="orderStatus != null  and orderStatus != ''">and order_status = #{orderStatus}</if>
-            <if test="workPerson != null  and workPerson != ''">and work_person = #{workPerson}</if>
-            <if test="isDeleted != null  and isDeleted != ''">and is_deleted = #{isDeleted}</if>
+            <if test="dangerScene != null  and dangerScene != ''">and danger_scene =
+            #{dangerScene}</if>
+            <if test="imgId != null  and imgId != ''">and img_id =
+            #{imgId}</if>
+            <if test="alarmTime != null  and alarmTime != ''">and alarm_time =
+            #{alarmTime}</if>
+            <if test="sceneAddress != null  and sceneAddress != ''">and scene_address =
+            #{sceneAddress}</if>
+            <if test="alarmDesc != null  and alarmDesc != ''">and alarm_desc =
+            #{alarmDesc}</if>
+            <if test="orderId != null  and orderId != ''">and order_id like concat('%',
+            #{orderId},
+            '%'
+            )</if>
+            <if test="orderStatus != null  and orderStatus != ''">and order_status =
+            #{orderStatus}</if>
+            <if test="workPerson != null  and workPerson != ''">and work_person =
+            #{workPerson}</if>
+            <if test="isDeleted != null  and isDeleted != ''">and is_deleted =
+            #{isDeleted}</if>
             and order_status != '30'
         </where>
+        ORDER BY alarm_time desc
     </select>
 
     <select id="selectSpqAlarmOrderListNo" parameterType="SpqAlarmOrder" resultMap="SpqAlarmOrderResult">
@@ -51,6 +63,7 @@
             <if test="isDeleted != null  and isDeleted != ''">and is_deleted = #{isDeleted}</if>
             and order_status != '10'
         </where>
+        ORDER BY alarm_time desc
     </select>
 
     <select id="selectSpqAlarmOrderById" parameterType="String" resultMap="SpqAlarmOrderResult">