From adc8542adeabbcbeff425d6471762c04e8f3cffe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 25 六月 2025 15:03:38 +0800
Subject: [PATCH] 修改功能和增加上传功能
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java
index 7398b91..c0bccce 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -40,19 +41,19 @@
public Map<String, Object> rewardDetailsList(String driverName, String driverPhone, String createTime, Integer offset, Integer limit) throws Exception {
String startTime = "";
String endTime = "";
- if(ToolUtil.isNotEmpty(createTime)){
+ if (ToolUtil.isNotEmpty(createTime)) {
String[] split = createTime.split(" - ");
startTime = split[0];
endTime = split[1];
}
- List<Map<String, Object>> list = this.baseMapper.rewardDetailsList(ShiroKit.getUser().getObjectId(), driverName, driverPhone, startTime, endTime, offset, limit);
- int count = this.baseMapper.rewardDetailsListCount(ShiroKit.getUser().getObjectId(), driverName, driverPhone, startTime, endTime);
- Double aDouble = this.baseMapper.rewardDetailsListSum(ShiroKit.getUser().getObjectId(), driverName, driverPhone, startTime, endTime);
+ List<Map<String, Object>> list = this.baseMapper.rewardDetailsList(ShiroExtUtil.getUser().getObjectId(), driverName, driverPhone, startTime, endTime, offset, limit);
+ int count = this.baseMapper.rewardDetailsListCount(ShiroExtUtil.getUser().getObjectId(), driverName, driverPhone, startTime, endTime);
+ Double aDouble = this.baseMapper.rewardDetailsListSum(ShiroExtUtil.getUser().getObjectId(), driverName, driverPhone, startTime, endTime);
Map<String, Object> map1 = new HashMap<>();
map1.put("insertTime", "合计");
map1.put("money", aDouble);
list.add(map1);
-
+
Map<String, Object> map = new HashMap<>();
map.put("rows", list);
map.put("total", count);
@@ -68,7 +69,7 @@
startTime = split[0];
endTime = split[1];
}
- List<Map<String, Object>> list = this.baseMapper.rewardDetailsList(ShiroKit.getUser().getObjectId(), driverName, driverPhone, startTime, endTime, null, null);
+ List<Map<String, Object>> list = this.baseMapper.rewardDetailsList(ShiroExtUtil.getUser().getObjectId(), driverName, driverPhone, startTime, endTime, null, null);
String[] title = new String[]{"时间", "司机名称", "活动名称", "奖励支出"};
String[][] values = new String[list.size()][5];
for (int i = 0; i < list.size(); i++) {
--
Gitblit v1.7.1