From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
index 6ccb928..266ed8e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -1115,7 +1115,7 @@
// 司机奖励
between4 = new EntityWrapper<DriverActivityHistory>()
.eq("carryOut", 2)
- .in(!collect.isEmpty(), "activityId", collect)
+ .in(!collect.isEmpty(), "driverActivityId", collect)
;
} else {
// 专车wrapper
@@ -1142,7 +1142,7 @@
// 司机奖励
between4 = new EntityWrapper<DriverActivityHistory>()
.eq("carryOut", 2)
- .in(!collect.isEmpty(), "activityId", collect)
+ .in(!collect.isEmpty(), "driverActivityId", collect)
.between("insertTime", start, end);
}
@@ -1464,7 +1464,7 @@
// 司机奖励
between4 = new EntityWrapper<DriverActivityHistory>()
.eq("carryOut", 2)
- .in(!collect.isEmpty(), "activityId", collect)
+ .in(!collect.isEmpty(), "driverActivityId", collect)
;
} else {
// 专车wrapper
@@ -1493,7 +1493,7 @@
// 司机奖励
between4 = new EntityWrapper<DriverActivityHistory>()
.eq("carryOut", 2)
- .in(!collect.isEmpty(), "activityId", collect)
+ .in(!collect.isEmpty(), "driverActivityId", collect)
.between("insertTime", start, end);
}
--
Gitblit v1.7.1