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/controller/general/ReportController.java | 96 +++++++++++++++++++++++++-----------------------
1 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java
index a1cd875..f4a55eb 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java
@@ -5,8 +5,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.SinataUtil;
@@ -24,6 +24,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
@@ -64,16 +65,19 @@
@Autowired
private ITPubWithdrawalService tPubWithdrawalService;
-
+
@Autowired
private IComplaintDeductmoneyService complaintDeductmoneyService;
-
+
@Autowired
private ITTaxiCardPaymentService taxiCardPaymentService;
-
+
@Autowired
private ITOrderTaxiService orderTaxiService;
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到用户管理首页
*/
@@ -81,7 +85,7 @@
public String user() {
return PREFIX + "tUser.html";
}
-
+
/**
* 跳转到订单收益
* @return
@@ -116,7 +120,7 @@
String ids,Integer type,String payType) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
@@ -125,10 +129,10 @@
/*if (ShiroKit.getUser().getRoleType() != 1){
page.setRecords(null);
}else{*/
- ShiroUser user = ShiroKit.getUser();
- List<Map<String,Object>> list = orderTaxiService.getOrderList(page,beginTime,endTime,ids,type,payType,user.getObjectId());
- page.setRecords(list);
- /* }*/
+ ShiroUser user = shiroExtUtil.getUser();
+ List<Map<String, Object>> list = orderTaxiService.getOrderList(page, beginTime, endTime, ids, type, payType, user.getObjectId());
+ page.setRecords(list);
+ /* }*/
return super.packForBT(page);
}
@@ -157,7 +161,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = orderTaxiService.getOrderListEx(beginTime,endTime,ids,type,payType,ShiroKit.getUser().getObjectId());
+ List<Map<String, Object>> mapList = orderTaxiService.getOrderListEx(beginTime, endTime, ids, type, payType, shiroExtUtil.getUser().getObjectId());
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -265,20 +269,20 @@
String ids) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroKit.getUser().getRoleType() != 1){
+ if (shiroExtUtil.getUser().getRoleType() != 1) {
page.setRecords(null);
- }else{
-
- List<Map<String,Object>> list = companyService.getCompanyIncomeList(page,beginTime,endTime,ids);
- Map<String,Object> map = new HashMap<>();
- map.put("id","合计");
- map.put("money",companyService.getSumCompanyIncomeMoney(beginTime,endTime,ids));
+ } else {
+
+ List<Map<String, Object>> list = companyService.getCompanyIncomeList(page, beginTime, endTime, ids);
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", "合计");
+ map.put("money", companyService.getSumCompanyIncomeMoney(beginTime, endTime, ids));
list.add(map);
page.setRecords(list);
}
@@ -352,19 +356,19 @@
String ids,String type) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-
- List<Map<String,Object>> list = taxiCardPaymentService.getList(page,beginTime,endTime,ids,type,null,null,null,null,ShiroKit.getUser().getObjectId());
- Map<String,Object> map = new HashMap<>();
- map.put("id","合计");
- map.put("payMoney",taxiCardPaymentService.getSumMoney(beginTime,endTime,ids,type,null,null,null,null,ShiroKit.getUser().getObjectId()));
- list.add(map);
- page.setRecords(list);
+
+ List<Map<String, Object>> list = taxiCardPaymentService.getList(page, beginTime, endTime, ids, type, null, null, null, null, shiroExtUtil.getUser().getObjectId());
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", "合计");
+ map.put("payMoney", taxiCardPaymentService.getSumMoney(beginTime, endTime, ids, type, null, null, null, null, shiroExtUtil.getUser().getObjectId()));
+ list.add(map);
+ page.setRecords(list);
return super.packForBT(page);
}
@@ -387,7 +391,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = taxiCardPaymentService.getListEx(beginTime,endTime,ids,type,null,null,null,null,ShiroKit.getUser().getObjectId());
+ List<Map<String, Object>> mapList = taxiCardPaymentService.getListEx(beginTime, endTime, ids, type, null, null, null, null, shiroExtUtil.getUser().getObjectId());
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -429,20 +433,20 @@
String ids) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroKit.getUser().getRoleType() != 1){
+ if (shiroExtUtil.getUser().getRoleType() != 1) {
page.setRecords(null);
- }else{
-
- List<Map<String,Object>> list = complaintDeductmoneyService.getList(page,beginTime,endTime,ids,null,null,null,ShiroKit.getUser().getObjectId());
- Map<String,Object> map = new HashMap<>();
- map.put("id","合计");
- map.put("money",complaintDeductmoneyService.getSumMoney(beginTime,endTime,ids,null,null,null,ShiroKit.getUser().getObjectId()));
+ } else {
+
+ List<Map<String, Object>> list = complaintDeductmoneyService.getList(page, beginTime, endTime, ids, null, null, null, shiroExtUtil.getUser().getObjectId());
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", "合计");
+ map.put("money", complaintDeductmoneyService.getSumMoney(beginTime, endTime, ids, null, null, null, shiroExtUtil.getUser().getObjectId()));
list.add(map);
page.setRecords(list);
}
@@ -469,7 +473,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = complaintDeductmoneyService.getListEx(beginTime,endTime,ids,null,null,null,ShiroKit.getUser().getObjectId());
+ List<Map<String, Object>> mapList = complaintDeductmoneyService.getListEx(beginTime, endTime, ids, null, null, null, shiroExtUtil.getUser().getObjectId());
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -520,20 +524,20 @@
String ids) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroKit.getUser().getRoleType() != 1){
+ if (shiroExtUtil.getUser().getRoleType() != 1) {
page.setRecords(null);
- }else{
-
- List<Map<String,Object>> list = tPubWithdrawalService.getReportWithdrawalList(page,beginTime,endTime,ids);
- Map<String,Object> map = tPubWithdrawalService.getSumMoney(beginTime,endTime,ids);
- if(map!=null){
- map.put("id","合计");
+ } else {
+
+ List<Map<String, Object>> list = tPubWithdrawalService.getReportWithdrawalList(page, beginTime, endTime, ids);
+ Map<String, Object> map = tPubWithdrawalService.getSumMoney(beginTime, endTime, ids);
+ if (map != null) {
+ map.put("id", "合计");
list.add(map);
}
page.setRecords(list);
--
Gitblit v1.7.1