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/TDriverController.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 9bff68c..bcdfe0d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -210,7 +210,7 @@
//查询平台ID
TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).eq("state", 0).ne("flag", 3));
//判断是平台司机还是加盟司机
- if ((SinataUtil.isEmpty(tDriver.getCompanyId()) || tDriver.getCompanyId() == 0 || tDriver.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tDriver.getFranchiseeId()) || tDriver.getFranchiseeId() == 0)){
+ if (1 == tDriver.getCompanyId()){
model.addAttribute("companyType",1);
}else{
model.addAttribute("companyType",2);
@@ -654,12 +654,11 @@
tDriver.setCompanyId(oneId);
}
if (SinataUtil.isNotEmpty(twoId)){
- tDriver.setFranchiseeId(twoId);
+ tDriver.setCompanyId(twoId);
}
}else if (1 == companyType.intValue()){
TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
tDriver.setCompanyId(company.getId());
- tDriver.setFranchiseeId(franchiseeId);
}
tDriver.setAddType(2);
tDriver.setIsPlatCar(1);
@@ -669,7 +668,7 @@
tDriver.setCompanyId(ShiroKit.getUser().getObjectId());
}
if (SinataUtil.isNotEmpty(franchiseeId)){
- tDriver.setFranchiseeId(franchiseeId);
+ tDriver.setCompanyId(franchiseeId);
}
tDriver.setAddType(3);
tDriver.setIsPlatCar(2);
@@ -681,7 +680,7 @@
tDriver.setCompanyId(tCompany.getSuperiorId());
}
if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
- tDriver.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ tDriver.setCompanyId(ShiroKit.getUser().getObjectId());
}
tDriver.setAddType(4);
tDriver.setIsPlatCar(2);
@@ -804,19 +803,18 @@
tDriver.setCompanyId(oneId);
}
if (SinataUtil.isNotEmpty(twoId)){
- tDriver.setFranchiseeId(twoId);
+ tDriver.setCompanyId(twoId);
}
}else if (1 == companyType.intValue()){
TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
tDriver.setCompanyId(company.getId());
- tDriver.setFranchiseeId(franchiseeId);
}
}else if (2 == roleType){ //分公司
if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
tDriver.setCompanyId(ShiroKit.getUser().getObjectId());
}
if (SinataUtil.isNotEmpty(franchiseeId)){
- tDriver.setFranchiseeId(franchiseeId);
+ tDriver.setCompanyId(franchiseeId);
}
}else if (3 == roleType){ //加盟商
TCompany tCompany = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
@@ -824,7 +822,7 @@
tDriver.setCompanyId(tCompany.getSuperiorId());
}
if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
- tDriver.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ tDriver.setCompanyId(ShiroKit.getUser().getObjectId());
}
}
tDriver.setUpdateTime(new Date());
@@ -1204,8 +1202,7 @@
}else if ("加盟司机".equals(one)){
driver.setIsPlatCar(2);
}
- driver.setCompanyId(companyId);
- driver.setFranchiseeId(franchiseeId);
+ driver.setCompanyId(0 != franchiseeId ? franchiseeId : companyId);
driver.setState(2);
driver.setAuthState(2);
driver.setFlag("1");
@@ -1464,8 +1461,7 @@
driver.setDriveCard(three);
driver.setTaxiAptitudeCard(seven);
driver.setIsPlatCar(2);
- driver.setCompanyId(companyId);
- driver.setFranchiseeId(franchiseeId);
+ driver.setCompanyId(0 != franchiseeId ? franchiseeId : companyId);
driver.setState(1);
driver.setAuthState(1);
driver.setFlag("1");
@@ -1718,8 +1714,7 @@
driver.setDriveCard(two);
driver.setTaxiAptitudeCard(six);
driver.setIsPlatCar(2);
- driver.setCompanyId(companyId);
- driver.setFranchiseeId(franchiseeId);
+ driver.setCompanyId(0 != franchiseeId ? franchiseeId : companyId);
driver.setState(1);
driver.setAuthState(1);
driver.setFlag("1");
--
Gitblit v1.7.1