From 387f61d55a8e20bc772b026cba4f8c34dfce5665 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 07 二月 2024 11:20:28 +0800 Subject: [PATCH] 更新代码 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml index a00c013..bb6c8b0 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml @@ -8,8 +8,10 @@ <result column="account" property="account" /> <result column="jobNumber" property="jobNumber" /> <result column="phone" property="phone" /> + <result column="phoneOperator" property="phoneOperator" /> <result column="password" property="password" /> - <result column="name" property="name" /> + <result column="lastName" property="lastName" /> + <result column="firstName" property="firstName" /> <result column="sex" property="sex" /> <result column="idCard" property="idCard" /> <result column="companyId" property="companyId" /> @@ -31,7 +33,8 @@ <result column="driverContactAddress" property="driverContactAddress" /> <result column="driverAge" property="driverAge" /> <result column="driveCard" property="driveCard" /> - <result column="driveCardImgUrl" property="driveCardImgUrl" /> + <result column="driveCardImgUrl1" property="driveCardImgUrl1" /> + <result column="driveCardImgUrl2" property="driveCardImgUrl2" /> <result column="driverType" property="driverType" /> <result column="getDriverLicenseDate" property="getDriverLicenseDate" /> <result column="driverLicenseOn" property="driverLicenseOn" /> @@ -67,6 +70,7 @@ <result column="laveBusinessMoney" property="laveBusinessMoney" /> <result column="laveBusinessMoney" property="laveBusinessMoney" /> <result column="appletsOpenId" property="appletsOpenId"/> + <result column="email" property="email"/> <result column="flag" property="flag"/> @@ -84,8 +88,10 @@ account as account, jobNumber as jobNumber, phone as phone, + phoneOperator as phoneOperator, password as password, - name as name, + lastName as lastName, + firstName as firstName, sex as sex, idCard as idCard, companyId as companyId, @@ -107,7 +113,8 @@ driverContactAddress as driverContactAddress, driverAge as driverAge, driveCard as driveCard, - driveCardImgUrl as driveCardImgUrl, + driveCardImgUrl1 as driveCardImgUrl1, + driveCardImgUrl2 as driveCardImgUrl2, driverType as driverType, getDriverLicenseDate as getDriverLicenseDate, driverLicenseOn as driverLicenseOn, @@ -166,13 +173,16 @@ <select id="queryIdleDriver_" resultType="Driver"> + select * from ( select id as id, account as account, jobNumber as jobNumber, phone as phone, + phoneOperator as phoneOperator, password as password, - name as name, + lastName as lastName, + firstName as firstName, sex as sex, idCard as idCard, companyId as companyId, @@ -194,7 +204,8 @@ driverContactAddress as driverContactAddress, driverAge as driverAge, driveCard as driveCard, - driveCardImgUrl as driveCardImgUrl, + driveCardImgUrl1 as driveCardImgUrl1, + driveCardImgUrl2 as driveCardImgUrl2, driverType as driverType, getDriverLicenseDate as getDriverLicenseDate, driverLicenseOn as driverLicenseOn, @@ -248,10 +259,16 @@ ) 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> ) + ) as aa <!--where aa.id not in ( + select driverId from t_order_private_car where isDelete = 1 and driverPay = 1 and state in (7, 8, 9) + union all + select driverId from t_order_logistics where isDelete = 1 and driverPay = 1 and state != 10 + )--> </select> @@ -261,7 +278,7 @@ b.id as orderId, b.state as state, a.id as driverId, - a.`name` as `name`, + CONCAT(a.firstName, " ", a.lastName) as `name`, a.headImgUrl as avatar, case when b.telX is null then a.phone else b.telX end as phone, c.carLicensePlate as carCode, @@ -303,7 +320,7 @@ select a.id as id, a.headImgUrl as avatar, - a.`name` as `name`, + CONCAT(a.firstName, " ", a.lastName) as `name`, a.phone as phone, a.idCard as idcode, b.carLicensePlate as licensePlate, @@ -332,7 +349,7 @@ select id as id, phone as phone, - name as name, + CONCAT(firstName, " ", lastName) as name, headImgUrl as avatar, DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime from -- Gitblit v1.7.1