From 77bca6b387f9349d072b8737e82b42fd7f723be0 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 02 八月 2024 18:07:39 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..d7f2ee7 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,15 @@
<select id="query" resultType="map">
- select * from
- (
+ select
+ aa.*,
+ (CASE WHEN (select count(id) from t_driver_activity_history where driverId = #{driverId} and carryOut = 1 and `day` = aa.time) = 0 THEN 2 ELSE 1 END) carryOut
+ 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
+ DATE_FORMAT(`day`, '%Y-%m-%d') as paramTime
from t_driver_activity_history where driverId = #{driverId} group by `day`
- ) as a order by a.time desc limit #{pageNum}, #{size}
+ ) as aa order by aa.time desc limit #{pageNum}, #{size}
</select>
<select id="queryList" resultType="DriverActivityHistory">
@@ -37,7 +39,7 @@
carryOut as carryOut,
money as money,
insertTime as insertTime
- from t_driver_activity_history where `day` between #{start} and #{end}
+ 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>
--
Gitblit v1.7.1