From b1f2f102034b4433201225b67a9fc78c08e532f0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 六月 2025 18:35:03 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
index 2352ca2..2fb94f9 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -164,7 +164,7 @@
Wrapper<TDriver> ne1 = new EntityWrapper<TDriver>().ne("state", 1).eq("authState", 2).ne("flag", 3);
if(companyId != null){
- ne1.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ ne1.eq("companyId", companyId);
}
List<TDriver> tDrivers = tDriverService.selectList(ne1);
String keys = "";
@@ -225,14 +225,14 @@
Wrapper<TDriver> ne4 = new EntityWrapper<TDriver>().eq("authState", 2).ne("flag", 3);
if(companyId != null){
- ne4.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ ne4.eq("companyId", companyId);
}
int i2 = tDriverService.selectCount(ne4);
map1.put("netcarDriverSum", i2); //总司机
Wrapper<TCar> state3 = new EntityWrapper<TCar>().eq("state", 1);
if(companyId != null){
- state3.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ state3.eq("companyId", companyId);
}
int state1 = tCarService.selectCount(state3);
map1.put("netCarSum", state1); //总车辆
@@ -257,7 +257,7 @@
Wrapper<TDriver> ne3 = new EntityWrapper<TDriver>().between("insertTime", calendar3.getTime(), calendar4.getTime()).eq("authState", 2).ne("flag", 3);
if(companyId != null){
- ne3.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ ne3.eq("companyId", companyId);
}
int i5 = tDriverService.selectCount(ne3);
map1.put("netcarDriverSum", i5);
@@ -414,7 +414,7 @@
Integer[] driverStates = new Integer[]{2,3};
Wrapper<TDriver> ne = new EntityWrapper<TDriver>().eq("authState", 2).in("state", driverStates).ne("flag", 3);
if(companyId != null){
- ne.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ ne.eq("companyId", companyId);
}
if(state!=null){
ne.eq("state",state);
--
Gitblit v1.7.1