From 6209aee60fd4a4a0253a701659c411e4dc35063b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 11 八月 2025 19:36:39 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
index 852035d..20dcaa2 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
@@ -14,7 +14,6 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
import java.util.*;
@@ -48,16 +47,31 @@
@Override
public Map<String, Object> queryCars(Integer uid) throws Exception {
Driver driver = driverService.selectById(uid);
- List<Map<String, Object>> list = carMapper.queryIdleData(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
- driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
Map<String, Object> map = new HashMap<>();
- map.put("list", list);
- Map<String, Object> map1 = driverService.queryInfo(uid);
- if(null == map1.get("licensePlate")){
- map.put("car", "");
- }else{
- map.put("car", map1.get("licensePlate") + "-" + map1.get("brand") + " " + map1.get("carColor"));
+
+ Integer carId = driver.getCarId();
+ map.put("car", "");
+ if(carId!=null){
+ Car car = carMapper.selectById(carId);
+ if(car.getCarLicensePlate()!=null){
+ CarBrand carBrand = carBrandMapper.selectById(car.getCarBrandId());
+ CarModel carModel = carModelMapper.selectById(car.getCarModelId());
+ map.put("car", car.getCarLicensePlate()+"-" + carBrand.getName() +carModel.getName()+ " " + car.getCarColor());
+ }
}
+
+ List<Map<String, Object>> list = carMapper.queryIdleDataFromId(driver.getId());
+// List<Map<String, Object>> list = carMapper.queryIdleData(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
+// driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
+ for (Map<String, Object> stringObjectMap : list) {
+ // 1使用中 2空闲中
+ if(stringObjectMap.get("useDriverId")!=null && stringObjectMap.get("useDriverId").toString().equals(uid.toString())){
+ map.put("useState", 1);
+ }else {
+ map.put("useState", 0);
+ }
+ }
+ map.put("list", list);
return map;
}
@@ -144,4 +158,27 @@
this.insert(car);
return ResultUtil.success();
}
+
+ @Override
+ public boolean useState(Integer carId, Integer uid) {
+ Car car = carMapper.selectById(carId);
+ if(car.getUseDriverId()!=null && !car.getUseDriverId().equals(uid)){
+ return false;
+ }
+ return true;
+
+
+ }
+
+ @Override
+ public void updateUseState(Integer carId, Integer uid) {
+ carMapper.updateUseState(uid);
+ Car car = carMapper.selectById(carId);
+ car.setUseDriverId(uid);
+ this.baseMapper.updateById(car);
+ }
+ @Override
+ public void updateUseState(Integer uid) {
+ carMapper.updateUseState(uid);
+ }
}
--
Gitblit v1.7.1