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/DriverActivityHistoryMapper.xml | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
index 4ac3b9d..d1f80e0 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
@@ -18,13 +18,16 @@
<select id="query" resultType="map">
- select * from
- (
- select
- DATE_FORMAT(`day`, '%Y-%m-%d') as time,
- if((select count(id) from t_driver_activity_history where driverId = #{driverId}) > (select count(id) from t_driver_activity_history where driverId = #{driverId} and carryOut = 2), 1, 2) as carryOut
- from t_driver_activity_history where driverId = #{driverId} group by `day`
- ) as a order by a.time desc limit #{pageNum}, #{size}
+ select
+ a.*,
+ CASE WHEN b.num = 0 THEN 2 ELSE 1 END as carryOut
+ from (
+ select
+ DATE_FORMAT(`day`, '%Y-%m-%d') as time,
+ DATE_FORMAT(`day`, '%Y-%m-%d') as paramTime
+ from t_driver_activity_history where driverId = #{driverId} group by `day`
+ ) as a
+ left join (select `day`, count(id) as num from t_driver_activity_history where driverId = #{driverId} and carryOut = 1 group by `day`) b on (a.time = b.`day`) order by a.time desc limit #{pageNum}, #{size}
</select>
<select id="queryList" resultType="DriverActivityHistory">
@@ -37,6 +40,30 @@
carryOut as carryOut,
money as money,
insertTime as insertTime
+ from t_driver_activity_history where `day` between #{start} and #{end} and driverActivityId in (select id from t_driver_activity where status = 3 and now() between startTime and endTime)
+ <if test="null != type">
+ and `type` = #{type}
+ </if>
+ <if test="null != carryOut">
+ and carryOut = #{carryOut}
+ </if>
+ <if test="null != driverId">
+ and driverId = #{driverId}
+ </if>
+ </select>
+
+
+
+ <select id="queryHistoryList" resultType="DriverActivityHistory">
+ select
+ id as id,
+ `day` as `day`,
+ driverId as driverId,
+ `type` as `type`,
+ activityId as activityId,
+ carryOut as carryOut,
+ money as money,
+ insertTime as insertTime
from t_driver_activity_history where `day` between #{start} and #{end}
<if test="null != type">
and `type` = #{type}
--
Gitblit v1.7.1