From d9da603305a2b94bde78483fa8777a43ee352548 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期二, 18 一月 2022 08:22:49 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
index 55394c3..f80b044 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
@@ -5,10 +5,7 @@
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.*;
-import cn.exrick.xboot.your.service.IAddOilService;
-import cn.exrick.xboot.your.service.ICarService;
-import cn.exrick.xboot.your.service.IDrivingRecordService;
-import cn.exrick.xboot.your.service.IOrderTaskService;
+import cn.exrick.xboot.your.service.*;
import cn.exrick.xboot.your.vo.CarVo;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -45,7 +42,7 @@
@Autowired
private IDrivingRecordService iDrivingRecordService;
@Autowired
- private IOrderTaskService iOrderTaskService;
+ private ICustomerService iCustomerService;
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@@ -85,7 +82,7 @@
queryWrapper.ge(beginTime!=null && beginTime!="","add_date",beginTime);
wrapper.le(endTime!=null && endTime!="","in_time",endTime);
- queryWrapper.le(endTime!=null && endTime!="","add_date",beginTime);
+ queryWrapper.le(endTime!=null && endTime!="","add_date",endTime);
QueryWrapper<OrderTask> wrapper1 = new QueryWrapper<>();
@@ -152,9 +149,28 @@
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<Car> saveOrUpdate(Car car) {
+ QueryWrapper<Car> wrapper = new QueryWrapper<>();
+ QueryWrapper<Car> wrapper1 = new QueryWrapper<>();
+ if (!car.getUserId().equals("")){
+ wrapper.eq("user_id",car.getUserId());
+ Car car1 = iCarService.getOne(wrapper);
+ if (car1!=null && !car1.getId().equals(car.getId())){
+ return new ResultUtil<Car>().setErrorMsg("璇ラ┚椹跺憳宸茶鍏朵粬杞﹁締缁戝畾,璇峰厛瑙ｇ粦");
+ }
+ }
+
+ if (!car.getFollowUserId().equals("")){
+ wrapper1.eq("follow_user_id",car.getFollowUserId());
+ Car car1 = iCarService.getOne(wrapper1);
+ if (car1!=null && !car1.getId().equals(car.getId())){
+ return new ResultUtil<Car>().setErrorMsg("璇ラ厤閫佸憳宸茶鍏朵粬杞﹁締缁戝畾,璇峰厛瑙ｇ粦");
+ }
+ }
+
if (iCarService.saveOrUpdate(car)) {
return new ResultUtil<Car>().setData(car);
}
+
return new ResultUtil<Car>().setErrorMsg("鎿嶄綔澶辫触");
}
--
Gitblit v1.9.1