bug

zhangzeli

2022-01-11 cef6ee12bbbb42b8674fc3f9353d08df013115d7

 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)
@@ -94,13 +91,10 @@
            wrapper1.ge(beginTime!=null && beginTime!="","send_date",beginTime);
            wrapper1.le(endTime!=null && endTime!="","send_date",endTime);

            OrderTask orderTask = iOrderTaskService.getOne(wrapper1);

            DrivingRecord drivingRecord = iDrivingRecordService.getOne(wrapper);

            AddOil addOil = iAddOilService.getOne(queryWrapper);



            if (addOil!=null){
                carVo.setMoney(addOil.getMoney());
@@ -155,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("操作失败");
    }