From 997bf5ea58c2741b1862a1010bf5d60a32850c4f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 三月 2023 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 c3f1920..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
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.CarBrandMapper;
import com.stylefeng.guns.modular.system.dao.CarMapper;
import com.stylefeng.guns.modular.system.dao.CarModelMapper;
@@ -14,6 +15,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -124,8 +126,8 @@
* @throws Exception
*/
@Override
- public ResultUtil addCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicensePhoto,
- String carPhoto, String insurancePhoto, 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){
@@ -138,23 +140,25 @@
}
}
+ 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));
+ }
car.setCarPhoto(carPhoto);
car.setInsurancePhoto(insurancePhoto);
-
+ if(ToolUtil.isNotEmpty(commercialInsuranceTime)){
+ car.setCommercialInsuranceTime(sdf.parse(commercialInsuranceTime));
+ }
Driver driver = driverService.selectById(uid);
car.setCompanyId(driver.getCompanyId());
car.setFranchiseeId(driver.getFranchiseeId());
--
Gitblit v1.7.1