From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 c67ecda..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
@@ -130,8 +130,8 @@
select driverId from t_driver_work where startTime < now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
)
and id in (select driverId from t_driver_orders where `type` = #{type})
+ and id not in (select driverId from t_settlement_record where paymentStatus = 1)
and carId in (select carId from t_car_service where `type` = #{type}
-
<if test="null != serverCarModelId">
and serverCarModelId = #{serverCarModelId}
</if>
@@ -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