From 503bc89c55d675a27b689419aa906a070ca5cb03 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 五月 2024 09:33:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 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..cbb187e 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
@@ -86,6 +86,7 @@
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>
@@ -128,6 +129,7 @@
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>
@@ -147,6 +149,7 @@
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
@@ -211,6 +214,7 @@
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
@@ -275,6 +279,7 @@
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