From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 12 ++++--------
1 files changed, 4 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 7469829..02494d0 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,8 +126,8 @@
* @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) throws Exception {
Car query = carMapper.query(licensePlate);
if(id==null){
@@ -142,18 +142,14 @@
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