From 2c5957854caea8b0fc0f7c957a946979e2e5554a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 05 九月 2025 18:05:50 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index b999bc1..a7cce8b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -90,6 +90,9 @@
) as o
<where>
FIND_IN_SET(o.authState,'1,4') and o.flag != 3
+ <if test="null != companyId">
+ and o.companyId = #{companyId}
+ </if>
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
@@ -134,13 +137,14 @@
<!--根据审核通过的司机列表-->
<select id="getDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,ci.carLicensePlate,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
+ SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,if(dw.driverId is null, '', ci.carLicensePlate) as carLicensePlate,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
(IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0) + IFNULL(ot7.num, 0)) as historyNum,
(IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0) + IFNULL(ot8.money, 0)) as historyMoney,
dd.* from t_driver as dd
LEFT JOIN (select * from t_company where type = 2 and flag != 3) as cc1 on cc1.id = dd.companyId
LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
LEFT JOIN (select * from t_car where state = 1) as ci on ci.id = dd.carId
+ LEFT JOIN (select * from t_driver_work where state = 1) as dw on dd.id = dw.driverId
LEFT JOIN (
SELECT
GROUP_CONCAT(case when type = 1 then '快车'
--
Gitblit v1.7.1