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 | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 ff91bee..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}")
@@ -697,6 +703,8 @@
}).start();
return SUCCESS_TIP;
}
+
+
@RequestMapping(value = "/update1")
@ResponseBody
public Object update1(TCar tCar,String bindDriverId) {
@@ -704,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