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 | 114 ++++++++++++++++++++++----------------------------------
1 files changed, 45 insertions(+), 69 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 4f4da7f..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
@@ -11,13 +11,13 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.*;
-import com.stylefeng.guns.core.util.DateUtil;
-import com.stylefeng.guns.core.util.WoUtil;
import com.stylefeng.guns.modular.system.dao.DriverPunishMapper;
import com.stylefeng.guns.modular.system.dao.DriverTrainMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
-import com.stylefeng.guns.modular.system.util.*;
+import com.stylefeng.guns.modular.system.util.EmailUtil;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -79,8 +79,21 @@
@Value("${spring.mail.template-path}")
private String templatePath;
-
-
+
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private IIncomeService incomeService;
+ @Autowired
+ private ITUserService userService;
+ @Autowired
+ private IUserActivityInviteService userActivityInviteService;
+ @Autowired
+ private IDriverActivityRegisteredService driverActivityRegisteredService;
+ @Autowired
+ private ITCompanyService itCompanyService;
+ @Autowired
+ private ITDriverServiceService itDriverServiceService;
/**
* 跳转到司机审核列表首页
@@ -105,7 +118,8 @@
*/
@RequestMapping("/tDriver_add")
public String tDriverAdd(Model model) {
- List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
+ .eq("state", 0).ne("flag", 3));
model.addAttribute("companyList",companyList);
Integer roleType = ShiroKit.getUser().getRoleType();
@@ -184,19 +198,19 @@
model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
if (1 == roleType){
- List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
model.addAttribute("companyList",companyList);
- List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()));
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()).eq("state", 0).ne("flag", 3));
model.addAttribute("franchiseeList",franchiseeList);
}else if (2 == roleType){
- List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()).eq("state", 0).ne("flag", 3));
model.addAttribute("franchiseeList",franchiseeList);
}
//查询平台ID
- TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
+ 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);
@@ -257,7 +271,6 @@
model.addAttribute("id", id);
return PREFIX + "training.html";
}
-
/**
* 保存培训数据
@@ -328,7 +341,6 @@
return ResultUtil.success(driverTrains);
}
-
/**
* 跳转到处罚页
* @param id
@@ -340,7 +352,6 @@
model.addAttribute("id", id);
return PREFIX + "punish.html";
}
-
/**
* 保存处罚数据
@@ -404,7 +415,6 @@
return ResultUtil.success();
}
-
/**
* 获取所有处罚数据
* @param driverId
@@ -416,7 +426,6 @@
List<DriverPunish> driverPunishes = driverPunishMapper.queryAllPunish(driverId);
return ResultUtil.success(driverPunishes);
}
-
/**
* 根据分公司ID获取加盟商
@@ -472,7 +481,8 @@
public Object listYesDriver(String insertTime,
String companyName,
String phone,
- String name,
+ String lastName,
+ String firstName,
Integer addType,
Integer authState,
Integer state,
@@ -485,7 +495,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tDriverService.getDriverList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,companyName,phone,name,addType,authState,state,teamId));
+ page.setRecords(tDriverService.getDriverList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,companyName,phone,lastName,firstName,addType,authState,state,teamId));
return super.packForBT(page);
}
@@ -514,20 +524,6 @@
return super.packForBT(page);
}
-
- @Autowired
- private IIncomeService incomeService;
-
-
- @Autowired
- private ITUserService userService;
-
- @Autowired
- private IUserActivityInviteService userActivityInviteService;
-
- @Autowired
- private IDriverActivityRegisteredService driverActivityRegisteredService;
-
/**
* 审核操作 1=通过 2=不通过
@@ -588,7 +584,6 @@
type = 6;
tDriver.setAuthState(4);
}
-
new Thread(new Runnable() {
@Override
public void run() {
@@ -612,9 +607,9 @@
driver_audit1_user.text("Hello " + tDriver.getFirstName() + " " + tDriver.getLastName() + "，");
Element driver_audit1_content = document.getElementById("driver_audit1_content");
if(1 == authState){
- driver_audit1_content.text("You application has been approved.");
+ driver_audit1_content.text("Your application has been approved.");
}else{
- driver_audit1_content.text("I'm sorry, your application was rejected. Reason for rejection: Incomplete filling in personal information.");
+ driver_audit1_content.text("We are sorry to inform you that your application was rejected. Please contact our service for relevant details, call 0577777767 or send e-mail to support@i-go.group");
}
EmailUtil.send(tDriver.getEmail(), 1 == authState ? "Driver is verified and qualified" : "Driver is not verified and qualified", document.html());
}catch (Exception e){
@@ -659,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);
@@ -674,7 +668,7 @@
tDriver.setCompanyId(ShiroKit.getUser().getObjectId());
}
if (SinataUtil.isNotEmpty(franchiseeId)){
- tDriver.setFranchiseeId(franchiseeId);
+ tDriver.setCompanyId(franchiseeId);
}
tDriver.setAddType(3);
tDriver.setIsPlatCar(2);
@@ -686,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);
@@ -734,7 +728,7 @@
return SUCCESS_TIP;
}
-
+
/**
* 添加线路
* @param subArr
@@ -754,7 +748,6 @@
}
}
-
/**
* 删除司机审核列表
*/
@@ -767,8 +760,6 @@
return SUCCESS_TIP;
}
- @Autowired
- private RedisUtil redisUtil;
/**
* 操作司机状态
*/
@@ -780,8 +771,8 @@
if (1 == optType){ //解冻
tDriver.setAuthState(2);
}else if (2 == optType){ //冻结
- String key = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
- redisUtil.remove(key);//删除个人信息数据
+ String token = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
+ redisUtil.remove(token);//删除个人信息数据
redisUtil.remove("DRIVER_" + tDriver.getPhone());//删除后台冻结相关缓存
redisUtil.remove("DRIVER_" + driverId);//清除存储的token
tDriver.setAuthState(3);
@@ -812,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());
@@ -832,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());
@@ -1212,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");
@@ -1472,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");
@@ -1726,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");
@@ -1790,15 +1777,6 @@
}
return SUCCESS_TIP;
}
-
-
-
-
- @Autowired
- private ITCompanyService itCompanyService;
-
- @Autowired
- private ITDriverServiceService itDriverServiceService;
/**
* 验证是否可以字符转为整数
@@ -1891,8 +1869,8 @@
}else{
shellList.add("-");
}
- if(SinataUtil.isNotEmpty(object.get("name"))){
- shellList.add(object.get("name").toString());
+ if(SinataUtil.isNotEmpty(object.get("firstName"))){
+ shellList.add(object.get("firstName").toString() + " " + object.get("lastName").toString());
}else{
shellList.add("-");
}
@@ -1902,7 +1880,7 @@
shellList.add("-");
}
if(SinataUtil.isNotEmpty(object.get("sex"))){
- shellList.add(object.get("sex").toString() == "1"?"男":"女");
+ shellList.add(object.get("sex").toString().equals("1")?"男":"女");
}else{
shellList.add("-");
}
@@ -1969,8 +1947,6 @@
}
if(SinataUtil.isNotEmpty(object.get("authState"))){
shellList.add(object.get("authState").toString().equals("1")?"待审核":(object.get("authState").toString().equals("2")?"正常":(object.get("authState").toString().equals("3")?"冻结":(object.get("authState").toString().equals("4")?"已拒绝":""))));
-
- shellList.add(object.get("authState").toString());
}else{
shellList.add("-");
}
--
Gitblit v1.7.1