From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 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 6f53aee..d6f0cac 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
@@ -344,7 +344,9 @@
a.sex as sex,
a.`name` as `name`,
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,
@@ -362,11 +364,12 @@
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.driveCardImgUrl1 as driveCardImgUrl1,
+ 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,
--
Gitblit v1.7.1