From 9ef2e272c6ef99d152c5d6afc95af70a3822c57d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 09 九月 2023 18:12:28 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 7469829..d2f48c8 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
@@ -126,34 +126,30 @@
* @throws Exception
*/
@Override
- public ResultUtil addCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicensePhoto, String drivingLicenseEndTime,
- String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid,Integer id) throws Exception {
+ public ResultUtil addCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicenseNumber, String drivingLicensePhoto, String drivingLicenseEndTime,
+ String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid,Integer id, String peopleAndCarsPhone, Integer language) throws Exception {
Car query = carMapper.query(licensePlate);
if(id==null){
if(null != query){
- return ResultUtil.error("车牌号已经使用");
+ return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "License plate number has been used" : "Plaque d’immatriculation déjà utilisée");
}
}else{
if(null != query && !id.equals(query.getId())){
- return ResultUtil.error("车牌号已经使用");
+ return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "License plate number has been used" : "Plaque d’immatriculation déjà utilisée");
}
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Car car = new Car();
- car.setDriverId(uid);
- car = carMapper.selectOne(car);
- if(car==null){
- car = new Car();
- car.setId(id);
- }
+ car.setPeopleAndCarsPhone(peopleAndCarsPhone);
car.setCarModelId(modelId);
CarModel carModel = carModelMapper.selectById(modelId);
car.setCarBrandId(carModel.getBrandId());
car.setCarColor(color);
car.setCarLicensePlate(licensePlate);
car.setAnnualInspectionTime(time);
+ car.setDrivingLicenseNumber(drivingLicenseNumber);
car.setDrivingLicensePhoto(drivingLicensePhoto);
if(ToolUtil.isNotEmpty(drivingLicenseEndTime)){
car.setDrivingLicenseEndTime(sdf.parse(drivingLicenseEndTime));
--
Gitblit v1.7.1