From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
index f75b778..9bf614f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
@@ -79,8 +79,7 @@
@Override
public boolean idle(Integer id) throws Exception {
Car car = this.selectById(id);
- List<Map<String, Object>> list = carMapper.queryIdleData(car.getFranchiseeId() != null && car.getFranchiseeId() != 0 ? car.getFranchiseeId() : (
- car.getCompanyId() != null && car.getCompanyId() != 0 ? car.getCompanyId() : 1));
+ List<Map<String, Object>> list = carMapper.queryIdleData(car.getCompanyId());
for(Map<String, Object> map : list){
Integer carId = Integer.valueOf(String.valueOf(map.get("id")));
if(carId.compareTo(id) == 0){
@@ -156,7 +155,7 @@
carBrand.setName(otherBrand);
carBrand.setRemark("1");
Integer insert = carBrandMapper.insert(carBrand);
- car.setCarBrandId(insert);
+ car.setCarBrandId(carBrand.getId());
}else {
// CarModel carModel = carModelMapper.selectById(modelId);
car.setCarBrandId(carBrandList.get(0).getId());
@@ -177,6 +176,8 @@
carModel.setBrandId(car.getCarBrandId());
carModel.setRemark("1");
carModelMapper.insert(carModel);
+ car.setCarModelId(carModel.getId());
+
// carModel.setSeat();
}else {
car.setCarModelId(carModels.get(0).getId());
@@ -201,16 +202,13 @@
}
Driver driver = driverService.selectById(uid);
car.setCompanyId(driver.getCompanyId());
- car.setFranchiseeId(driver.getFranchiseeId());
car.setInsertTime(new Date());
car.setState(1);
car.setAuthState(1);
car.setAddType(1);
car.setDriverId(uid);
- car.setAddObjectId(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
- driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
- Company company = companyMapper.selectById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
- driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
+ car.setAddObjectId(driver.getCompanyId());
+ Company company = companyMapper.selectById(driver.getCompanyId());
car.setIsPlatCar(company.getType() == 1 ? 1 : 2);
this.insertOrUpdate(car);
//判断司机是否已经关联车辆，未关联车辆默认关联当前车辆
--
Gitblit v1.7.1