From 25cf266e99714ac5d428e66b40ce272325c91dd8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 14 六月 2025 15:01:11 +0800
Subject: [PATCH] 修改管理后台账号和共享session等 屏蔽除出租车外的其他模块
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java
index 6d74848..3f2b697 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java
@@ -4,6 +4,7 @@
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.util.ExcelUtil;
@@ -83,11 +84,11 @@
/*if (ShiroKit.getUser().getRoleType() != 1){
page.setRecords(null);
}else{*/
-
- List<Map<String,Object>> list = orderTaxiService.getIncomeOrderList(page,beginTime,endTime,phone,name,state,type,ShiroKit.getUser().getObjectId(), income, payType);
+
+ List<Map<String, Object>> list = orderTaxiService.getIncomeOrderList(page, beginTime, endTime, phone, name, state, type, ShiroExtUtil.getUser().getObjectId(), income, payType);
list = list.stream().filter(e-> ToolUtil.isNotEmpty(e.get("payState"))).collect(Collectors.toList());
- Page<Map<String,Object>> page1 = new Page<>(0, 1000000);
- List<Map<String,Object>> list1 = orderTaxiService.getIncomeOrderList(page1,beginTime,endTime,phone,name,state,type,ShiroKit.getUser().getObjectId(), income, payType);
+ Page<Map<String, Object>> page1 = new Page<>(0, 1000000);
+ List<Map<String, Object>> list1 = orderTaxiService.getIncomeOrderList(page1, beginTime, endTime, phone, name, state, type, ShiroExtUtil.getUser().getObjectId(), income, payType);
list1 = list1.stream().filter(e->ToolUtil.isNotEmpty(e.get("payState"))).collect(Collectors.toList());
BigDecimal orderMoney = new BigDecimal("0");
BigDecimal money = new BigDecimal("0");
@@ -223,7 +224,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = orderTaxiService.getIncomeOrderListEx(beginTime,endTime,phone,name,state,type,ShiroKit.getUser().getObjectId(), income, payType);
+ List<Map<String, Object>> mapList = orderTaxiService.getIncomeOrderListEx(beginTime, endTime, phone, name, state, type, ShiroExtUtil.getUser().getObjectId(), income, payType);
mapList = mapList.stream().filter(e-> ToolUtil.isNotEmpty(e.get("payState"))).collect(Collectors.toList());
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -377,7 +378,7 @@
String id, Integer orderType) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
@@ -386,14 +387,14 @@
/*if (ShiroKit.getUser().getRoleType() != 1){
page.setRecords(null);
}else{*/
-
- List<Map<String,Object>> list = orderLogisticsService.getTimeOutOrderList(page,beginTime,endTime,phone,name,id,ShiroKit.getUser().getObjectId(), orderType);
- Map<String,Object> map = orderLogisticsService.getTimeOutOrderSumMoney(beginTime,endTime,phone,name,id,ShiroKit.getUser().getObjectId(), orderType);
- if(!list.isEmpty() && map!=null){
- map.put("id","合计");
- list.add(map);
- }
- page.setRecords(list);
+
+ List<Map<String, Object>> list = orderLogisticsService.getTimeOutOrderList(page, beginTime, endTime, phone, name, id, ShiroExtUtil.getUser().getObjectId(), orderType);
+ Map<String, Object> map = orderLogisticsService.getTimeOutOrderSumMoney(beginTime, endTime, phone, name, id, ShiroExtUtil.getUser().getObjectId(), orderType);
+ if (!list.isEmpty() && map != null) {
+ map.put("id", "合计");
+ list.add(map);
+ }
+ page.setRecords(list);
/*}*/
return super.packForBT(page);
}
@@ -424,7 +425,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = orderLogisticsService.getTimeOutOrderListEx(beginTime,endTime,phone,name,id,ShiroKit.getUser().getObjectId(), orderType);
+ List<Map<String, Object>> mapList = orderLogisticsService.getTimeOutOrderListEx(beginTime, endTime, phone, name, id, ShiroExtUtil.getUser().getObjectId(), orderType);
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -505,12 +506,12 @@
/*if (ShiroKit.getUser().getRoleType() != 1){
page.setRecords(null);
}else{*/
-
- List<Map<String,Object>> list = taxiCardPaymentService.getList(page,beginTime,endTime,null,type,phone,name,id,cardName,ShiroKit.getUser().getObjectId());
+
+ List<Map<String, Object>> list = taxiCardPaymentService.getList(page, beginTime, endTime, null, type, phone, name, id, cardName, ShiroExtUtil.getUser().getObjectId());
if(list!=null && list.size()>0){
Map<String,Object> map = new HashMap<>();
- map.put("id","合计");
- map.put("payMoney",taxiCardPaymentService.getSumMoney(beginTime,endTime,null,type,phone,name,id,cardName,ShiroKit.getUser().getObjectId()));
+ map.put("id", "合计");
+ map.put("payMoney", taxiCardPaymentService.getSumMoney(beginTime, endTime, null, type, phone, name, id, cardName, ShiroExtUtil.getUser().getObjectId()));
list.add(map);
}
@@ -542,8 +543,8 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- Page<Map<String,Object>> page = new Page<>(1, 10000000);
- List<Map<String,Object>> mapList = taxiCardPaymentService.getList(page,beginTime,endTime,null,type,phone,name,id,cardName,ShiroKit.getUser().getObjectId());
+ Page<Map<String, Object>> page = new Page<>(1, 10000000);
+ List<Map<String, Object>> mapList = taxiCardPaymentService.getList(page, beginTime, endTime, null, type, phone, name, id, cardName, ShiroExtUtil.getUser().getObjectId());
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -599,12 +600,12 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-
- List<Map<String,Object>> list = complaintDeductmoneyService.getList(page,beginTime,endTime,null,userPhone,userName,id,ShiroKit.getUser().getObjectId());
+
+ List<Map<String, Object>> list = complaintDeductmoneyService.getList(page, beginTime, endTime, null, userPhone, userName, id, ShiroExtUtil.getUser().getObjectId());
if(list!=null && list.size()>0){
Map<String,Object> map = new HashMap<>();
- map.put("id","合计");
- map.put("money",complaintDeductmoneyService.getSumMoney(beginTime,endTime,null,userPhone,userName,id,ShiroKit.getUser().getObjectId()));
+ map.put("id", "合计");
+ map.put("money", complaintDeductmoneyService.getSumMoney(beginTime, endTime, null, userPhone, userName, id, ShiroExtUtil.getUser().getObjectId()));
list.add(map);
}
page.setRecords(list);
@@ -633,7 +634,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = complaintDeductmoneyService.getListEx(beginTime,endTime,null,userPhone,userName,id,ShiroKit.getUser().getObjectId());
+ List<Map<String, Object>> mapList = complaintDeductmoneyService.getListEx(beginTime, endTime, null, userPhone, userName, id, ShiroExtUtil.getUser().getObjectId());
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
--
Gitblit v1.7.1