From 75a2623173bcc4a235aa1f99f7ef28519186160b Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:24:25 +0800
Subject: [PATCH] 代码调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 116 +++------------------------------------------------------
1 files changed, 7 insertions(+), 109 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index 3867455..e0997e5 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -67,6 +67,7 @@
<result column="laveBusinessMoney" property="laveBusinessMoney" />
<result column="laveBusinessMoney" property="laveBusinessMoney" />
<result column="appletsOpenId" property="appletsOpenId"/>
+ <result column="mchtNo" property="mchtNo"/>
<result column="flag" property="flag"/>
@@ -159,12 +160,7 @@
(
select driverId from t_driver_work where startTime < now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
)
- <if test="8>type">
- and id in (select driverId from t_driver_orders where `type` = #{type})
- </if>
- <if test="type>7">
- and id in (select driverId from t_driver_orders where `type` = 1)
- </if>
+ and id in (select driverId from t_driver_orders where `type` = #{type})
</select>
@@ -251,25 +247,12 @@
(
select driverId from t_driver_work where startTime < now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
)
- <if test="8>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>
- )
+ 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>
- <if test="type>7">
- and id in (select driverId from t_driver_orders where `type` =1)
- and carId in (select carId from t_car_service where `type` = 1
-
- <if test="null != serverCarModelId">
- and serverCarModelId = #{serverCarModelId}
- </if>
- )
- </if>
-
+ )
</select>
@@ -344,90 +327,5 @@
left join t_car_model c on (b.carModelId = c.id)
left join t_car_brand d on (c.brandId = d.id)
where a.id = #{id}
- </select>
-
-
- <select id="queryIdleDriver1" 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 != 1 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})
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1