From e6e316c9bfaeb7e872dc79c010b515707613dde2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 十月 2024 17:29:29 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
index aae0867..1d427a1 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
@@ -66,25 +66,23 @@
ORDER BY date_format(insertTime, '%Y-%m-%d') DESC
</select>
<select id="getList1" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- select
- a.`date` as times,
- a.driverNum,
- b.duration as timeNumber
- from (
- select `date`, count(driverId) as driverNum from t_driver_online where assessment = 0 group by `date`
- ) as a
- left join (
- select `date`, sum(duration) as duration from t_driver_online where assessment = 0 group by `date`
- ) as b on (a.date = b.date)
- ORDER BY a.date DESC
+ select aa.startTime as times, aa.driverNum, bb.duration as timeNumber from (
+ select a.startTime, count(a.driverId) as driverNum from (
+ select DATE_FORMAT(startTime, '%Y-%m-%d') as startTime, driverId from t_driver_work group by DATE_FORMAT(startTime, '%Y-%m-%d'), driverId
+ ) as a group by a.startTime
+ ) as aa
+ left join (
+ select DATE_FORMAT(startTime, '%Y-%m-%d') as startTime, sum(if(endTime is null, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(endTime)) - UNIX_TIMESTAMP(startTime)) as duration from t_driver_work group by DATE_FORMAT(startTime, '%Y-%m-%d')
+ ) as bb on (aa.startTime = bb.startTime)
+ ORDER BY aa.startTime DESC
</select>
<select id="getList2" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- select
- CONCAT(b.firstName, ' ', b.lastName) as `name`,
- a.duration as timeNumber
- from t_driver_online a
- left join t_driver b on (a.driverId = b.id)
- where a.assessment = 0 and DATE_FORMAT(a.`date`, '%Y-%m-%d') = #{times}
+ select
+ CONCAT(b.firstName, ' ', b.lastName) as `name`,
+ a.duration as timeNumber
+ from (select DATE_FORMAT(startTime, '%Y-%m-%d') as startTime, driverId, sum(if(endTime is null, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(endTime)) - UNIX_TIMESTAMP(startTime)) as duration from t_driver_work group by DATE_FORMAT(startTime, '%Y-%m-%d'), driverId) as a
+ left join t_driver b on (a.driverId = b.id)
+ where a.startTime = #{times}
</select>
<select id="getTotal" resultType="map">
SELECT COUNT(o.driverId) driverNum,SUM(o.timeNumber) timeNumber from (SELECT
--
Gitblit v1.7.1