From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +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 | 76 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 21 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 3b2ef24..53142ff 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
@@ -8,9 +8,11 @@
<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="withdrawPassword" property="withdrawPassword"/>
- <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" />
@@ -89,9 +91,11 @@
id as id,
account as account,
jobNumber as jobNumber,
+ phoneOperator as phoneOperator,
phone as phone,
password as password,
- name as name,
+ firstName as firstName,
+ lastName as lastName,
sex as sex,
idCard as idCard,
companyId as companyId,
@@ -113,7 +117,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,
@@ -161,9 +166,11 @@
id as id,
account as account,
jobNumber as jobNumber,
+ phoneOperator as phoneOperator,
phone as phone,
password as password,
- name as name,
+ firstName as firstName,
+ lastName as lastName,
sex as sex,
idCard as idCard,
companyId as companyId,
@@ -185,7 +192,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,
@@ -235,9 +243,11 @@
id as id,
account as account,
jobNumber as jobNumber,
+ phoneOperator as phoneOperator,
phone as phone,
password as password,
- name as name,
+ firstName as firstName,
+ lastName as lastName,
sex as sex,
idCard as idCard,
companyId as companyId,
@@ -259,7 +269,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,
@@ -339,9 +350,13 @@
a.id as id,
a.headImgUrl as avatar,
a.sex as sex,
- a.`name` as `name`,
+ a.lastName as lastName,
+ a.firstName as firstName,
+ a.phoneOperator as phoneOperator,
a.phone as phone,
+ DATE_FORMAT(a.birthday, '%Y-%m-%d') as birthday,
a.email,
+ a.driverAddress,
a.qrCode,
a.language,
a.laveActivityMoney as balance,
@@ -359,13 +374,16 @@
DATE_FORMAT(a.getDriverLicenseDate, '%Y-%m-%d') as getDriverLicenseDate,
(select GROUP_CONCAT(type Separator ',') from t_driver_service where driverId = a.id) as `type`,
a.placeOfPractice as placeOfPractice,
- a.driveCardImgUrl as driveCardImgUrl,
+ a.driveCardImgUrl1 as driveCardImgUrl,
+ a.driveCardImgUrl2 as driveCardImgUrl2,
b.drivingLicensePhoto,b.carModelId,b.carBrandId,a.carId,
a.networkCarlssueImg as networkCarlssueImg,
a.placeOfEmployment as placeOfEmployment,
+ (select id from t_city where chineseName = a.placeOfPractice or englishName = a.placeOfPractice or frenchName = a.placeOfPractice)placeOfPracticeId,
(select `name` from t_company where 1 = 1 and if(a.companyId is null or a.companyId = 0, id = 1, if(a.franchiseeId is null or a.franchiseeId = 0, id = a.companyId, id = a.franchiseeId))) as company,
b.carLicensePlate as licensePlate,
b.carColor as carColor,
+ b.vehicleId,
CONCAT(d.`name`, c.`name`) as brand,
(
(select count(id) from t_order_private_car where driverId = a.id and state in (7, 8, 9)) +
@@ -388,9 +406,11 @@
id as id,
account as account,
jobNumber as jobNumber,
+ phoneOperator as phoneOperator,
phone as phone,
password as password,
- name as name,
+ firstName as firstName,
+ lastName as lastName,
sex as sex,
idCard as idCard,
companyId as companyId,
@@ -412,7 +432,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,
@@ -461,9 +482,11 @@
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.name as name,
+ a.firstName as firstName,
+ a.lastName as lastName,
a.sex as sex,
a.idCard as idCard,
a.companyId as companyId,
@@ -485,7 +508,8 @@
a.driverContactAddress as driverContactAddress,
a.driverAge as driverAge,
a.driveCard as driveCard,
- a.driveCardImgUrl as driveCardImgUrl,
+ a.driveCardImgUrl1 as driveCardImgUrl1,
+ a.driveCardImgUrl2 as driveCardImgUrl2,
a.driverType as driverType,
a.getDriverLicenseDate as getDriverLicenseDate,
a.driverLicenseOn as driverLicenseOn,
@@ -541,9 +565,11 @@
id as id,
account as account,
jobNumber as jobNumber,
+ phoneOperator as phoneOperator,
phone as phone,
password as password,
- name as name,
+ firstName as firstName,
+ lastName as lastName,
sex as sex,
idCard as idCard,
companyId as companyId,
@@ -565,7 +591,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,
@@ -622,9 +649,11 @@
id as id,
account as account,
jobNumber as jobNumber,
+ phoneOperator as phoneOperator,
phone as phone,
password as password,
- name as name,
+ firstName as firstName,
+ lastName as lastName,
sex as sex,
idCard as idCard,
companyId as companyId,
@@ -646,7 +675,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,
@@ -696,9 +726,11 @@
id as id,
account as account,
jobNumber as jobNumber,
+ phoneOperator as phoneOperator,
phone as phone,
password as password,
- name as name,
+ firstName as firstName,
+ lastName as lastName,
sex as sex,
idCard as idCard,
companyId as companyId,
@@ -720,7 +752,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,
@@ -765,10 +798,11 @@
<select id="queryMyInviteDriverList" resultType="map">
select
id as id,
+ phoneOperator as phoneOperator,
phone as phone,
- name as name,
+ CONCAT(firstName, " ", lastName) as name,
headImgUrl as avatar,
- DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime
+ DATE_FORMAT(insertTime,'%Y-%m-%d %H:%i') as insertTime
from
t_driver
where uid=#{uid}
--
Gitblit v1.7.1