From e28d33c09405e246a2d75fcb1f69a9e8e9d911b8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 29 九月 2022 09:07:31 +0800
Subject: [PATCH] 更新最新代码
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..ceb0bd8 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 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,6 +140,7 @@
}
}
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Car car = new Car();
car.setDriverId(uid);
car = carMapper.selectOne(car);
@@ -145,6 +148,7 @@
car = new Car();
car.setId(id);
}
+ car.setPeopleAndCarsPhone(peopleAndCarsPhone);
car.setCarModelId(modelId);
CarModel carModel = carModelMapper.selectById(modelId);
car.setCarBrandId(carModel.getBrandId());
@@ -152,9 +156,14 @@
car.setCarLicensePlate(licensePlate);
car.setAnnualInspectionTime(time);
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