From 4dbd2e0a473ef33ecf8a7200f62b61d4dbd87f25 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 06 八月 2024 10:31:45 +0800
Subject: [PATCH] 电磁锁主动操控记录查询提交

---
 ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
index 104d743..52db00a 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
@@ -180,4 +180,21 @@
         )
         select dept_id from rsd) order by "asc".car_id desc,atl.lock_num
     </select>
+    <select id="selectByBrandAndType" resultMap="ArdSyCarResult" parameterType="java.lang.String">
+        select * from ard_sy_car
+        <where>
+            <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
+            <if test="carBrand != null  and carBrand != ''"> and car_brand = #{carBrand}</if>
+        </where>
+    </select>
+    <select id="selectArdSyCarAndTankLock" resultMap="ArdSyCarLockResult" >
+       select "asc".id,"asc".car_id,"asc".car_model,"asc".car_type,
+       "asc".car_brand,"asc".dept_id,"asc".car_picture,atl.id as lid,
+       atl.lock_num,atl.lock_name,atl.img_position_top,atl.img_position_left,
+       atl.car_id as lcar_id,atl.enable,coalesce(atl.restart_state,'') as restart_state,
+       coalesce(atl.online_time,'') as online_time
+       from ard_sy_car "asc"
+       inner join ard_tank_lock atl on "asc".car_id = atl.car_id
+       order by "asc".car_id desc,atl.lock_num
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3