From 79d97c39f1d118824f91467feb9f4a55717fd0c0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 七月 2024 14:03:41 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 568 --------------------------------------------------------
1 files changed, 8 insertions(+), 560 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index 53142ff..f965994 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -87,151 +87,13 @@
<select id="queryByPhone" resultType="Driver">
- select
- id as id,
- account as account,
- jobNumber as jobNumber,
- phoneOperator as phoneOperator,
- phone as phone,
- password as password,
- firstName as firstName,
- lastName as lastName,
- 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,
- driveCardImgUrl1 as driveCardImgUrl1,
- driveCardImgUrl2 as driveCardImgUrl2,
- 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,
- activityMoney as activityMoney,
- laveActivityMoney as laveActivityMoney,
- businessMoney as businessMoney,
- laveBusinessMoney as laveBusinessMoney,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
+ select *
from t_driver where flag != 3 and authState != 4 and phone = #{phone}
</select>
<select id="queryAccount" resultType="Driver">
- select
- id as id,
- account as account,
- jobNumber as jobNumber,
- phoneOperator as phoneOperator,
- phone as phone,
- password as password,
- firstName as firstName,
- lastName as lastName,
- 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,
- driveCardImgUrl1 as driveCardImgUrl1,
- driveCardImgUrl2 as driveCardImgUrl2,
- 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,
- activityMoney as activityMoney,
- laveActivityMoney as laveActivityMoney,
- businessMoney as businessMoney,
- laveBusinessMoney as laveBusinessMoney,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
+ select *
from t_driver where flag != 3 and authState != 4 and account = #{account}
</select>
@@ -239,76 +101,7 @@
<select id="queryByPhone_" resultType="Driver">
- select
- id as id,
- account as account,
- jobNumber as jobNumber,
- phoneOperator as phoneOperator,
- phone as phone,
- password as password,
- firstName as firstName,
- lastName as lastName,
- 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,
- driveCardImgUrl1 as driveCardImgUrl1,
- driveCardImgUrl2 as driveCardImgUrl2,
- 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,
- activityMoney as activityMoney,
- laveActivityMoney as laveActivityMoney,
- businessMoney as businessMoney,
- laveBusinessMoney as laveBusinessMoney,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
+ select *
from t_driver where flag != 3 and authState = #{authState} and phone = #{phone}
</select>
@@ -402,152 +195,14 @@
<select id="queryByJobNum" resultType="Driver">
- select
- id as id,
- account as account,
- jobNumber as jobNumber,
- phoneOperator as phoneOperator,
- phone as phone,
- password as password,
- firstName as firstName,
- lastName as lastName,
- 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,
- driveCardImgUrl1 as driveCardImgUrl1,
- driveCardImgUrl2 as driveCardImgUrl2,
- 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,
- activityMoney as activityMoney,
- laveActivityMoney as laveActivityMoney,
- businessMoney as businessMoney,
- laveBusinessMoney as laveBusinessMoney,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
- from t_driver where flag != 3 and jobNumber = #{jobNum}
+ select * from t_driver where flag != 3 and jobNumber = #{jobNum}
</select>
<select id="queryWorkDriver" resultType="Driver">
select
- a.id as id,
- a.account as account,
- a.jobNumber as jobNumber,
- a.phoneOperator as phoneOperator,
- a.phone as phone,
- a.password as password,
- a.firstName as firstName,
- a.lastName as lastName,
- a.sex as sex,
- a.idCard as idCard,
- a.companyId as companyId,
- a.franchiseeId as franchiseeId,
- a.headImgUrl as headImgUrl,
- a.faceImgUrl as faceImgUrl,
- a.idCardImgUrl1 as idCardImgUrl1,
- a.idCardImgUrl2 as idCardImgUrl2,
- a.placeOfEmployment as placeOfEmployment,
- a.birthday as birthday,
- a.bankCardNumber as bankCardNumber,
- a.driverNationality as driverNationality,
- a.driverNation as driverNation,
- a.driverMaritalStatus as driverMaritalStatus,
- a.driverLanguageLevel as driverLanguageLevel,
- a.driverEducation as driverEducation,
- a.driverCensus as driverCensus,
- a.driverAddress as driverAddress,
- a.driverContactAddress as driverContactAddress,
- a.driverAge as driverAge,
- a.driveCard as driveCard,
- a.driveCardImgUrl1 as driveCardImgUrl1,
- a.driveCardImgUrl2 as driveCardImgUrl2,
- a.driverType as driverType,
- a.getDriverLicenseDate as getDriverLicenseDate,
- a.driverLicenseOn as driverLicenseOn,
- a.driverLicenseOff as driverLicenseOff,
- a.taxiDriver as taxiDriver,
- a.taxiAptitudeCard as taxiAptitudeCard,
- a.networkCarlssueImg as networkCarlssueImg,
- a.networkCarlssueOrganization as networkCarlssueOrganization,
- a.networkCarlssueDate as networkCarlssueDate,
- a.getNetworkCarProofDate as getNetworkCarProofDate,
- a.networkCarProofOn as networkCarProofOn,
- a.networkCarProofOff as networkCarProofOff,
- a.registerDate as registerDate,
- a.fullTimeDriver as fullTimeDriver,
- a.inDriverBlacklist as inDriverBlacklist,
- a.commercialType as commercialType,
- a.contractCompany as contractCompany,
- a.contractOn as contractOn,
- a.contractOff as contractOff,
- a.emergencyContact as emergencyContact,
- a.emergencyContactPhone as emergencyContactPhone,
- a.emergencyContactAddress as emergencyContactAddress,
- a.remark as remark,
- a.isPlatCar as isPlatCar,
- a.carId as carId,
- a.authState as authState,
- a.state as state,
- a.addType as addType,
- a.balance as balance,
- a.activityMoney as activityMoney,
- a.laveActivityMoney as laveActivityMoney,
- a.businessMoney as businessMoney,
- a.laveBusinessMoney as laveBusinessMoney,
- a.flag as flag,
- a.insertTime as insertTime,
- a.insertUser as insertUser,
- a.updateTime as updateTime,
- a.updateUser as updateUser
+ a.*
from t_driver a
left join t_driver_work b on (a.id = b.driverId)
where flag != 3 and b.state = 1
@@ -561,76 +216,7 @@
<select id="queryByCompanyId" resultType="Driver">
- select
- id as id,
- account as account,
- jobNumber as jobNumber,
- phoneOperator as phoneOperator,
- phone as phone,
- password as password,
- firstName as firstName,
- lastName as lastName,
- 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,
- driveCardImgUrl1 as driveCardImgUrl1,
- driveCardImgUrl2 as driveCardImgUrl2,
- 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,
- activityMoney as activityMoney,
- laveActivityMoney as laveActivityMoney,
- businessMoney as businessMoney,
- laveBusinessMoney as laveBusinessMoney,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
+ select *
from t_driver where flag != 3
<choose>
<when test="companyId == 1">
@@ -645,76 +231,7 @@
<select id="queryByIdentification" resultType="Driver">
- select
- id as id,
- account as account,
- jobNumber as jobNumber,
- phoneOperator as phoneOperator,
- phone as phone,
- password as password,
- firstName as firstName,
- lastName as lastName,
- 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,
- driveCardImgUrl1 as driveCardImgUrl1,
- driveCardImgUrl2 as driveCardImgUrl2,
- 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,
- activityMoney as activityMoney,
- laveActivityMoney as laveActivityMoney,
- businessMoney as businessMoney,
- laveBusinessMoney as laveBusinessMoney,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
+ select *
from t_driver where flag != 3 and idCard = #{identification}
</select>
@@ -722,76 +239,7 @@
<select id="queryByTaxiAptitudeCard" resultType="Driver">
- select
- id as id,
- account as account,
- jobNumber as jobNumber,
- phoneOperator as phoneOperator,
- phone as phone,
- password as password,
- firstName as firstName,
- lastName as lastName,
- 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,
- driveCardImgUrl1 as driveCardImgUrl1,
- driveCardImgUrl2 as driveCardImgUrl2,
- 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,
- activityMoney as activityMoney,
- laveActivityMoney as laveActivityMoney,
- businessMoney as businessMoney,
- laveBusinessMoney as laveBusinessMoney,
- flag as flag,
- insertTime as insertTime,
- insertUser as insertUser,
- updateTime as updateTime,
- updateUser as updateUser
+ select *
from t_driver where flag != 3 and taxiAptitudeCard = #{taxiAptitudeCard}
</select>
--
Gitblit v1.7.1