From 521efb9bc33d52ef4772f0b30f8a371ba4b0070c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 二月 2023 19:09:42 +0800
Subject: [PATCH] 更新最新代码
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml | 61 ++++++++----------------------
1 files changed, 16 insertions(+), 45 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 f633c71..5fdaebc 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,53 +66,24 @@
ORDER BY date_format(insertTime, '%Y-%m-%d') DESC
</select>
<select id="getList1" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT
- date_format(startTime, '%Y-%m-%d') times
- FROM
- t_driver_work
- GROUP BY
- date_format(startTime, '%Y-%m-%d')
- ORDER BY
- date_format(startTime, '%Y-%m-%d') DESC
+ 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)
</select>
<select id="getList2" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT
- w.driverId,
- d. NAME,
- o.timeNumber
-FROM
- t_driver_work w
-LEFT JOIN t_driver d ON d.id = w.driverId
-LEFT JOIN (
- SELECT
- IFNULL(SUM(o.timeNumber), 0) timeNumber,
- driverId
- FROM
- (
- SELECT
- TIMESTAMPDIFF(
- MINUTE,
- startTime,
- CASE
- WHEN endTime IS NULL THEN
- NOW()
- ELSE
- endTime
- END
- ) timeNumber,
- driverId
- FROM
- t_driver_work
- WHERE
- date_format(startTime, '%Y-%m-%d') = #{times}
-
- ) o GROUP BY
- driverId
-) o ON o.driverId = d.id
-WHERE
- date_format(startTime, '%Y-%m-%d') = #{times}
-GROUP BY
- w.driverId
+ select
+ b.`name`,
+ a.duration as timeNumber
+ from t_driver_online a
+ left join t_driver b on (a.driverId = b.id)
+ where assessment = 0 and DATE_FORMAT(date, '%Y-%m-%d') = '2022-12-29'
</select>
<select id="getTotal" resultType="map">
SELECT COUNT(o.driverId) driverNum,SUM(o.timeNumber) timeNumber from (SELECT
--
Gitblit v1.7.1