From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java | 112 +++++++++++++++++++++++++++++---------------------------
1 files changed, 58 insertions(+), 54 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 c0bccce..0f38b14 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,17 +1,17 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
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;
-import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
import com.stylefeng.guns.modular.system.dao.DriverActivityHistoryMapper;
+import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
import com.stylefeng.guns.modular.system.service.IDriverActivityHistoryService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -26,60 +26,64 @@
*/
@Service
public class DriverActivityHistoryServiceImpl extends ServiceImpl<DriverActivityHistoryMapper, DriverActivityHistory> implements IDriverActivityHistoryService {
- @Override
- public List<Map<String, Object>> getList(Page<Map<String, Object>> page, Integer activityId, Integer type) {
- return this.baseMapper.getList(page,activityId,type);
- }
-
- @Override
- public List<Map<String, Object>> getListt(Integer activityId, Integer type) {
- return this.baseMapper.getListt(activityId, type);
- }
-
-
- @Override
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+ @Override
+ public List<Map<String, Object>> getList(Page<Map<String, Object>> page, Integer activityId, Integer type) {
+ return this.baseMapper.getList(page, activityId, type);
+ }
+
+ @Override
+ public List<Map<String, Object>> getListt(Integer activityId, Integer type) {
+ return this.baseMapper.getListt(activityId, type);
+ }
+
+
+ @Override
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)) {
- String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
- }
- 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);
- return map;
- }
+ String startTime = "";
+ String endTime = "";
+ if (ToolUtil.isNotEmpty(createTime)) {
+ String[] split = createTime.split(" - ");
+ startTime = split[0];
+ endTime = split[1];
+ }
+ 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);
+ return map;
+ }
@Override
public HSSFWorkbook exportRewardDetails(String driverName, String driverPhone, String createTime) throws Exception {
- String startTime = "";
- String endTime = "";
- if(ToolUtil.isNotEmpty(createTime)){
- String[] split = createTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
- }
- 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++) {
- Map<String, Object> map = list.get(i);
- values[i][0] = null != map.get("insertTime") ? map.get("insertTime").toString() : "";
- values[i][1] = null != map.get("name") ? map.get("name").toString() : "";
- values[i][2] = null != map.get("activityName") ? map.get("activityName").toString() : "";
- values[i][3] = null != map.get("money") ? map.get("money").toString() : "";
- }
-
- return ExcelUtil.getHSSFWorkbook("奖励明细", title, values, null);
+ String startTime = "";
+ String endTime = "";
+ if (ToolUtil.isNotEmpty(createTime)) {
+ String[] split = createTime.split(" - ");
+ startTime = split[0];
+ endTime = split[1];
+ }
+ 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++) {
+ Map<String, Object> map = list.get(i);
+ values[i][0] = null != map.get("insertTime") ? map.get("insertTime").toString() : "";
+ values[i][1] = null != map.get("name") ? map.get("name").toString() : "";
+ values[i][2] = null != map.get("activityName") ? map.get("activityName").toString() : "";
+ values[i][3] = null != map.get("money") ? map.get("money").toString() : "";
+ }
+
+ return ExcelUtil.getHSSFWorkbook("奖励明细", title, values, null);
}
}
--
Gitblit v1.7.1