From 2a0298bb6ce4584ba311d7eba8454f515d2b0b3c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 31 一月 2024 15:42:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 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 c22a6a8..f75b778 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,5 +1,6 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.CarBrandMapper;
@@ -12,6 +13,7 @@
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -127,7 +129,8 @@
*/
@Override
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 {
+ String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid,Integer id, String peopleAndCarsPhone, Integer language
+ ,String otherBrand,String otherModel) throws Exception {
Car query = carMapper.query(licensePlate);
if(id==null){
@@ -143,9 +146,46 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Car car = new Car();
car.setPeopleAndCarsPhone(peopleAndCarsPhone);
- car.setCarModelId(modelId);
- CarModel carModel = carModelMapper.selectById(modelId);
- car.setCarBrandId(carModel.getBrandId());
+ //
+ if (!StringUtils.isEmpty(otherBrand)){
+ List<CarBrand> carBrandList = carBrandMapper.selectList(new EntityWrapper<CarBrand>().eq("name", otherBrand).eq("state",1));
+ if (carBrandList.isEmpty()){
+ CarBrand carBrand = new CarBrand();
+ carBrand.setState(1);
+ carBrand.setInsertTime(new Date());
+ carBrand.setName(otherBrand);
+ carBrand.setRemark("1");
+ Integer insert = carBrandMapper.insert(carBrand);
+ car.setCarBrandId(insert);
+ }else {
+// CarModel carModel = carModelMapper.selectById(modelId);
+ car.setCarBrandId(carBrandList.get(0).getId());
+ }
+ }else {
+ CarModel carModel = carModelMapper.selectById(modelId);
+ car.setCarBrandId(carModel.getBrandId());
+ }
+ //
+ if (!StringUtils.isEmpty(otherModel)){
+ List<CarModel> carModels = carModelMapper.selectList(new EntityWrapper<CarModel>().eq("name", otherModel).eq("brandId", car.getCarBrandId()).eq("state",1));
+ if (carModels.isEmpty()){
+ CarModel carModel = new CarModel();
+ carModel.setName(otherModel);
+ carModel.setState(1);
+ carModel.setInsertTime(new Date());
+ carModel.setSeat(5);
+ carModel.setBrandId(car.getCarBrandId());
+ carModel.setRemark("1");
+ carModelMapper.insert(carModel);
+// carModel.setSeat();
+ }else {
+ car.setCarModelId(carModels.get(0).getId());
+ }
+ }else {
+ car.setCarModelId(modelId);
+ }
+
+ //
car.setCarColor(color);
car.setCarLicensePlate(licensePlate);
car.setAnnualInspectionTime(time);
--
Gitblit v1.7.1