From f6d7a3f65aea500a275fa5f3f4325730bff16ade Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 九月 2023 09:35:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
index fd981b4..37b0ceb 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -47,6 +47,7 @@
                 AND alarm_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
             </if>
         </where>
+        order by alarm_time desc
     </select>
     
     <select id="selectArdAlarmRadarMoveById" parameterType="String" resultMap="ArdAlarmRadarMoveResult">
@@ -69,6 +70,7 @@
             <if test="viewTime != null">view_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
             <if test="userId != null">user_id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="guideFlag != null">guide_flag,</if>
@@ -86,6 +88,7 @@
             <if test="viewTime != null">#{viewTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
             <if test="userId != null">#{userId},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="guideFlag != null">#{guideFlag},</if>
@@ -106,6 +109,7 @@
             <if test="viewTime != null">view_time = #{viewTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="guideFlag != null">guide_flag = #{guideFlag},</if>
@@ -151,6 +155,7 @@
              GROUP BY aar.NAME
             ) r
                 INNER JOIN ard_alarm_radar_move aaar ON r.create_time1 = aaar.create_time
+        ORDER BY aaar.create_time desc
     </select>
     <update id="updateViewTimeByCondition" parameterType="String">
         update ard_alarm_radar_move
@@ -159,4 +164,7 @@
           and alarm_time&lt;=#{alarmTime}
           and view_time is null
     </update>
+    <select id="selectArdAlarmRadarLastData" parameterType="String" resultMap="ArdAlarmRadarMoveResult">
+        select * from ard_alarm_radar_move where name=#{name} order by update_time desc LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3