From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml
index 858805f..bfadc20 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml
@@ -46,6 +46,26 @@
</select>
+ <select id="queryIdleData1" resultType="map">
+ select
+ a.id as id,
+ CONCAT(a.carLicensePlate, '-',c.`name`, b.`name`, ' ', a.carColor) as name
+ from t_car a
+ left join t_car_model b on (a.carModelId = b.id)
+ left join t_car_brand c on (b.brandId = c.id)
+ where a.state = 1 and a.createBy = #{driverId}
+ <choose>
+ <when test="companyId != 1">
+ and a.companyId = #{companyId} or a.franchiseeId = #{companyId}
+ </when>
+ <otherwise>
+ and a.isPlatCar = 1
+ </otherwise>
+
+ </choose>
+ </select>
+
+
<select id="query" resultType="com.stylefeng.guns.modular.system.model.Car">
select
id as id,
--
Gitblit v1.7.1