From 0a8d28436b2f7229ecdf40c6b003902002c8947f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 十月 2025 17:37:08 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 163a84b..6bbe451 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -84,6 +84,12 @@
private CarInsuranceMapper carInsuranceMapper;
@Autowired
private ShiroExtUtil shiroExtUtil;
+
+ @Autowired
+ private ITDriverService driverService;
+
+ @Autowired
+ private IDriverWorkService driverWorkService;
@Value("${pushMinistryOfTransport}")
@@ -115,7 +121,8 @@
}
//查询当前用户所属分公司/加盟商
model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
-
+ model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());
+
//车辆品牌
List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
model.addAttribute("brandList",brandList);
@@ -157,7 +164,8 @@
Integer roleType = shiroExtUtil.getUser().getRoleType();
model.addAttribute("roleType", roleType);
model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
-
+ model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());
+
if (1 == roleType) {
List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
model.addAttribute("companyList", companyList);
@@ -241,7 +249,7 @@
Integer roleType = shiroExtUtil.getUser().getRoleType();
model.addAttribute("roleType", roleType);
model.addAttribute("objectName", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
-
+ model.addAttribute("objectId", tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId());
if (1 == roleType) {
List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2).eq("state", 0).ne("flag", 3));
model.addAttribute("companyList", companyList);
@@ -695,6 +703,8 @@
}).start();
return SUCCESS_TIP;
}
+
+
@RequestMapping(value = "/update1")
@ResponseBody
public Object update1(TCar tCar,String bindDriverId) {
@@ -702,6 +712,16 @@
if(bindDriverId==null){
bindDriverId="";
}
+ List<TDriver> tDrivers = driverService.selectList(new EntityWrapper<TDriver>().eq("carId", tCar.getId()).ne("flag", 3));
+ for (TDriver tDriver : tDrivers) {
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", tDriver.getId()).eq("state", 1));
+ if(null != driverWork){
+ return new ErrorTip(500, tDriver.getName() + "司机正在上班中，不能取消授权");
+ }else{
+ tDriver.setCarId(null);
+ driverService.updateAllColumnById(tDriver);
+ }
+ }
obj.setBindDriverId(bindDriverId);
tCarService.updateById(obj);
return SUCCESS_TIP;
--
Gitblit v1.7.1