From 5816ff2b23bbfe96291bb4cb3cc61d99d37fe986 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 19 二月 2024 10:01:51 +0800
Subject: [PATCH] 提交代码
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
index c3f1920..8d520e2 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
@@ -128,23 +128,10 @@
String carPhoto, String insurancePhoto, Integer uid,Integer id) throws Exception {
Car query = carMapper.query(licensePlate);
- if(id==null){
- if(null != query){
- return ResultUtil.error("车牌号已经使用");
- }
- }else{
- if(null != query && !id.equals(query.getId())){
- return ResultUtil.error("车牌号已经使用");
- }
+ if(null != query){
+ return ResultUtil.error("车牌号已经使用");
}
-
Car car = new Car();
- car.setDriverId(uid);
- car = carMapper.selectOne(car);
- if(car==null){
- car = new Car();
- car.setId(id);
- }
car.setCarModelId(modelId);
CarModel carModel = carModelMapper.selectById(modelId);
car.setCarBrandId(carModel.getBrandId());
@@ -160,20 +147,15 @@
car.setFranchiseeId(driver.getFranchiseeId());
car.setInsertTime(new Date());
car.setState(1);
- car.setAuthState(1);
car.setAddType(1);
- car.setDriverId(uid);
+ car.setAuthState(1);
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.setIsPlatCar(company.getType() == 1 ? 1 : 2);
- this.insertOrUpdate(car);
- //判断司机是否已经关联车辆，未关联车辆默认关联当前车辆
- if(driver.getCarId()==null){
- driver.setCarId(car.getId());
- driverService.updateById(driver);
- }
+ car.setDriverId(uid);
+ this.insert(car);
return ResultUtil.success();
}
}
--
Gitblit v1.7.1