From b61c4537a78d58412ef7ccd6e2c30152d807c5b7 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 29 七月 2024 11:04:54 +0800
Subject: [PATCH] 电磁锁密码查询去除上一组密码修改提交

---
 ard-work/src/main/resources/mapper/sy/ArdTankLockPasswordMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankLockPasswordMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankLockPasswordMapper.xml
index 06c022f..8bab74e 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankLockPasswordMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankLockPasswordMapper.xml
@@ -106,13 +106,19 @@
         atl.lock_name as "lockName" from ard_sy_car "asc"
         inner join ard_tank_lock atl on "asc".car_id = atl.car_id
         inner join ard_tank_lock_password atlp on atl.id = atlp.lock_id
-        where "asc".car_id = #{carId} order by "asc".car_id asc,use_time asc,no asc
+        inner join (select atlp.lock_id,max(create_time) as create_time
+        from ard_tank_lock_password atlp group by lock_id)t
+        on atlp.lock_id = t.lock_id and atlp.create_time = t.create_time
+        where "asc".car_id = #{carId} order by "asc".car_id asc,use_time desc,no asc
     </select>
 
     <select id="selectLockPasswordTotalByCarId" parameterType="java.lang.String" resultType="java.lang.Long">
         select count(*) from ard_sy_car "asc"
         inner join ard_tank_lock atl on "asc".car_id = atl.car_id
         inner join ard_tank_lock_password atlp on atl.id = atlp.lock_id
+        inner join (select atlp.lock_id,max(create_time) as create_time
+        from ard_tank_lock_password atlp group by lock_id)t
+        on atlp.lock_id = t.lock_id and atlp.create_time = t.create_time
         where "asc".car_id = #{carId}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3