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 --- DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml index a9c2a6b..673c673 100644 --- a/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml +++ b/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml @@ -91,6 +91,19 @@ and b.type = 1 and c.type = 1 and e.type = 1 and e.serverCarModelId = #{serverCarModelId} </select> + <select id="queryReassignOrderTransferCar" resultType="map"> + select + a.id as id, + CONCAT(a.`name`, '-', d.carLicensePlate) as `name` + from t_driver a + left join t_driver_service b on (a.id = b.driverId) + left join t_driver_orders c on (a.id = c.driverId) + left join t_car d on (a.carId = d.id) + left join t_car_service e on (d.id = e.carId) + where a.authState = 2 and a.state = 2 and a.flag != 3 and if(a.franchiseeId is null or a.franchiseeId = 0, a.companyId = #{companyId}, a.franchiseeId = #{companyId}) + and a.id in (select driverId from t_driver_work where state = 1 and type like '%1%') + and b.type = 7 and c.type = 7 and e.type = 7 and e.serverCarModelId = #{serverCarModelId} + </select> <select id="queryReassignDriverCrossCity" resultType="map"> select -- Gitblit v1.7.1