From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index 0d3ef08..ea97562 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -82,10 +82,11 @@
SELECT
GROUP_CONCAT(case when type = 1 then '专车'
when type = 2 then '出租车'
- when type = 3 then '直通车'
+ when type = 3 then '跨城'
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
) as o
<where>
@@ -124,10 +125,11 @@
SELECT
GROUP_CONCAT(case when type = 1 then '专车'
when type = 2 then '出租车'
- when type = 3 then '直通车'
+ when type = 3 then '跨城'
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end SEPARATOR '、') as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
where dd.id = #{driverId}
</select>
@@ -143,10 +145,11 @@
SELECT
GROUP_CONCAT(case when type = 1 then '专车'
when type = 2 then '出租车'
- when type = 3 then '直通车'
+ when type = 3 then '跨城'
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
LEFT JOIN (SELECT IFNULL(SUM(fraction)/COUNT(id),0) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
LEFT JOIN (SELECT COUNT(id) as taxiNum,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot1 on ot1.driverId = dd.id
@@ -207,10 +210,11 @@
SELECT
GROUP_CONCAT(case when type = 1 then '专车'
when type = 2 then '出租车'
- when type = 3 then '直通车'
+ when type = 3 then '跨城'
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = ci.id) as o
<where>
o.state = 1
@@ -271,10 +275,11 @@
SELECT
GROUP_CONCAT(case when type = 1 then '专车'
when type = 2 then '出租车'
- when type = 3 then '直通车'
+ when type = 3 then '跨城'
when type = 4 then '小件物流-同城'
when type = 5 then '小件物流-跨城'
when type = 6 then '包车'
+ when type = 7 then '接送机'
else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
LEFT JOIN (SELECT IFNULL(SUM(fraction)/COUNT(id),0) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
LEFT JOIN (SELECT COUNT(id) as taxiNum,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot1 on ot1.driverId = dd.id
--
Gitblit v1.7.1