From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:42:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index 0bb523e..62b2bd0 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -157,9 +157,8 @@
CONCAT(F.`name`, d.`name`, '.', c.carColor) as carName,
(select sum(fraction) / count(id) from t_order_evaluate where driverId = a.id) as score,
(
- (select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) +
- (select count(id) from t_order_taxi where state in (7, 8, 9) and driverId = a.id) +
- (select count(id) from t_order_cross_city where state in (6, 8, 9) and driverId = a.id)
+ (select count(id) from t_order_private_car where driverId = a.id and state in (6, 7, 8, 9)) +
+ (select count(id) from t_order_logistics where driverId = a.id and state in (6, 7, 8, 9))
) as num,
DATE_FORMAT(b.startServiceTime, '%m月%d日 %H:%i') as `time`,
b.startAddress as `start`,
@@ -205,9 +204,8 @@
(select count(id) from t_order_cross_city where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id)
) = 0, 2, 3)) as state,
(
- (select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) +
- (select count(id) from t_order_taxi where state in (7, 8, 9) and driverId = a.id) +
- (select count(id) from t_order_cross_city where state in (6, 8, 9) and driverId = a.id)
+ (select count(id) from t_order_private_car where driverId = a.id and state in (6, 7, 8, 9)) +
+ (select count(id) from t_order_logistics where driverId = a.id and state in (6, 7, 8, 9))
) as orderNum,
((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(id) from t_order_evaluate where driverId = a.id)) as fraction
from t_driver a
--
Gitblit v1.7.1