修改bug和管理后台报表

Pu Zhibing

2025-06-09 bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5

 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);
      }