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
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 1ea3ead..0643a44 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
@@ -115,18 +115,18 @@
<select id="queryHomeData" resultType="map">
select
b.carLicensePlate as licensePlate,
- CONCAT(d.`name`, c.`name`, ' . ', b.carColor) as brand,
+ CONCAT(d.`name`, ' ', c.`name`, ' . ', b.carColor) as brand,
(
(select count(id) from t_order_private_car where driverId = a.id and state in (7, 8, 9) and to_days(insertTime) = to_days(now())) +
(select count(id) from t_order_taxi where driverId = a.id and state in (7, 8, 9) and to_days(insertTime) = to_days(now())) +
(select count(id) from t_order_cross_city where driverId = a.id and state in (6, 8, 9) and to_days(insertTime) = to_days(now())) +
- (select count(id) from t_order_logistics where driverId = a.id and state in (6, 9) and to_days(insertTime) = to_days(now()))
+ (select count(id) from t_order_logistics where driverId = a.id and state in (7, 8, 9) and to_days(insertTime) = to_days(now()))
) as dayNum,
(
(select count(id) from t_order_private_car where driverId = a.id and state in (7, 8, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m')) +
(select count(id) from t_order_taxi where driverId = a.id and state in (7, 8, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m')) +
(select count(id) from t_order_cross_city where driverId = a.id and state in (6, 8, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m')) +
- (select count(id) from t_order_logistics where driverId = a.id and state in (6, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m'))
+ (select count(id) from t_order_logistics where driverId = a.id and state in (7, 8, 9) and DATE_FORMAT(insertTime, '%Y%m') = DATE_FORMAT(now(), '%Y%m'))
) as mouthNum,
((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(fraction) from t_order_evaluate where driverId = a.id)) as score,
if((select count(id) from t_driver_work where driverId = a.id and state = 1) != 0, 1, 2) as `work`
@@ -177,12 +177,10 @@
b.carLicensePlate as licensePlate,
b.carColor as carColor,
b.vehicleId,
- CONCAT(d.`name`, c.`name`) as brand,
+ CONCAT(d.`name`, ' ', c.`name`) as brand,
(
- (select count(id) from t_order_private_car where driverId = a.id and state in (7, 8, 9)) +
- (select count(id) from t_order_taxi where driverId = a.id and state in (7, 8, 9)) +
- (select count(id) from t_order_cross_city where driverId = a.id and state in (6, 8, 9)) +
- (select count(id) from t_order_logistics where driverId = a.id and state in (6, 9))
+ (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(fraction) from t_order_evaluate where driverId = a.id)) as score
from t_driver a
@@ -217,7 +215,7 @@
<select id="queryByCompanyId" resultType="Driver">
select *
- from t_driver where flag != 3
+ from t_driver where flag != 3 and authState = 2
<choose>
<when test="companyId == 1">
and (companyId = 1 or companyId is null or companyId = 0) and (franchiseeId = 0 or franchiseeId is null)
--
Gitblit v1.7.1