From f4c8c73bc5181b6d3265c6a0ce19ae13c600baa3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 九月 2025 12:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 1 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index a00c013..a8bb09a 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -254,6 +254,95 @@
)
</select>
+ <select id="queryIdleDriverService_" resultType="Driver">
+ select
+ id as id,
+ account as account,
+ jobNumber as jobNumber,
+ phone as phone,
+ password as password,
+ name as name,
+ sex as sex,
+ idCard as idCard,
+ companyId as companyId,
+ franchiseeId as franchiseeId,
+ headImgUrl as headImgUrl,
+ faceImgUrl as faceImgUrl,
+ idCardImgUrl1 as idCardImgUrl1,
+ idCardImgUrl2 as idCardImgUrl2,
+ placeOfEmployment as placeOfEmployment,
+ birthday as birthday,
+ bankCardNumber as bankCardNumber,
+ driverNationality as driverNationality,
+ driverNation as driverNation,
+ driverMaritalStatus as driverMaritalStatus,
+ driverLanguageLevel as driverLanguageLevel,
+ driverEducation as driverEducation,
+ driverCensus as driverCensus,
+ driverAddress as driverAddress,
+ driverContactAddress as driverContactAddress,
+ driverAge as driverAge,
+ driveCard as driveCard,
+ driveCardImgUrl as driveCardImgUrl,
+ driverType as driverType,
+ getDriverLicenseDate as getDriverLicenseDate,
+ driverLicenseOn as driverLicenseOn,
+ driverLicenseOff as driverLicenseOff,
+ taxiDriver as taxiDriver,
+ taxiAptitudeCard as taxiAptitudeCard,
+ networkCarlssueImg as networkCarlssueImg,
+ networkCarlssueOrganization as networkCarlssueOrganization,
+ networkCarlssueDate as networkCarlssueDate,
+ getNetworkCarProofDate as getNetworkCarProofDate,
+ networkCarProofOn as networkCarProofOn,
+ networkCarProofOff as networkCarProofOff,
+ registerDate as registerDate,
+ fullTimeDriver as fullTimeDriver,
+ inDriverBlacklist as inDriverBlacklist,
+ commercialType as commercialType,
+ contractCompany as contractCompany,
+ contractOn as contractOn,
+ contractOff as contractOff,
+ emergencyContact as emergencyContact,
+ emergencyContactPhone as emergencyContactPhone,
+ emergencyContactAddress as emergencyContactAddress,
+ remark as remark,
+ isPlatCar as isPlatCar,
+ carId as carId,
+ authState as authState,
+ state as state,
+ addType as addType,
+ balance as balance,
+ flag as flag,
+ insertTime as insertTime,
+ insertUser as insertUser,
+ updateTime as updateTime,
+ updateUser as updateUser
+ from t_driver
+ where flag != 3 and state = 3 and authState = 2
+ <if test="null != companyId">
+ <choose>
+ <when test="companyId != 1">
+ and companyId = #{companyId} or franchiseeId = #{companyId}
+ </when>
+ <otherwise>
+ and companyId is null or companyId = 0 or companyId = 1 or franchiseeId is null or franchiseeId = 0
+ </otherwise>
+ </choose>
+
+ </if>
+ and id in
+ (
+ select driverId from t_driver_work where startTime < now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
+ )
+ and id in (select driverId from t_driver_orders where `type` = #{type})
+ and carId in (select carId from t_car_service where `type` = #{type}
+ <if test="null != serverCarModelId">
+ and serverCarModelId = #{serverCarModelId}
+ </if>
+ )
+ </select>
+
<select id="queryOrderDriver" resultType="map">
@@ -265,7 +354,7 @@
a.headImgUrl as avatar,
case when b.telX is null then a.phone else b.telX end as phone,
c.carLicensePlate as carCode,
- CONCAT(F.`name`, d.`name`, '.', c.carColor) as carName,
+ CONCAT(f.`name`, d.`name`, '.', c.carColor) as carName,
(select sum(fraction) / count(id) from t_order_evaluate where driverId = a.id) as score,
(
(select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) +
--
Gitblit v1.7.1