bug

zhangzeli

2022-02-09 9c1d7ce35cc8c7dc81e0b259fb3b52211aa2f1bf

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java

@@ -4,13 +4,8 @@
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.AddOil;
import cn.exrick.xboot.your.entity.Car;
import cn.exrick.xboot.your.entity.DrivingRecord;
import cn.exrick.xboot.your.entity.Suggest;
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.entity.*;
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;
@@ -46,6 +41,9 @@
    private IAddOilService iAddOilService;
    @Autowired
    private IDrivingRecordService iDrivingRecordService;
    @Autowired
    private ICustomerService iCustomerService;


    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "通过id获取")
@@ -65,10 +63,11 @@

    @RequestMapping(value = "/getAll", method = RequestMethod.GET)
    @ApiOperation(value = "获取全部数据")
    public Result<List<CarVo>> getAll(String beginTime,String endTime) {
    public Result<List<CarVo>> getAll(String beginTime,String endTime,PageVo page) {
        List<CarVo> carVos = new ArrayList<>();
        List<Car> list = iCarService.getAll2();
        for (Car car:list){
        java.text.DecimalFormat   df   =new   java.text.DecimalFormat("#.##");
        IPage<Car> list = iCarService.getAll2(PageUtil.initMpPage(page));
        for (Car car:list.getRecords()){
            CarVo carVo = new CarVo();
            //加油信息
            QueryWrapper<AddOil> queryWrapper = new QueryWrapper<>();
@@ -83,15 +82,23 @@
            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<>();


            wrapper1.eq("car_id",car.getId());
            wrapper1.ge(beginTime!=null && beginTime!="","send_date",beginTime);
            wrapper1.le(endTime!=null && endTime!="","send_date",endTime);


            DrivingRecord drivingRecord = iDrivingRecordService.getOne(wrapper);

            AddOil addOil = iAddOilService.getOne(queryWrapper);

            if (addOil!=null){
                carVo.setMoney(addOil.getMoney());
                carVo.setOilWear(addOil.getAmount());
                carVo.setMoney(Double.parseDouble(df.format(addOil.getMoney())));
                carVo.setOilWear(Double.parseDouble(df.format(addOil.getAmount())));
            }

            if (drivingRecord!=null) {
@@ -101,12 +108,15 @@

            carVo.setCar(car);
            carVos.add(carVo);
            carVo.setTotal(list.getTotal());
        }
        return new ResultUtil<List<CarVo>>().setData(carVos);
    }
    @RequestMapping(value = "/getInfo", method = RequestMethod.GET)
    @ApiOperation(value = "通过车辆id获取")
    public Result<List<Car>> getInfo(String beginTime,String endTime) {
        java.text.DecimalFormat   df   =new   java.text.DecimalFormat("#.##");

        QueryWrapper<Car> wrapper = new QueryWrapper<>();
        wrapper.ge(beginTime!=null && beginTime!="","a.add_date",beginTime);
        wrapper.le(endTime!=null && endTime!="","a.add_date",endTime);
@@ -116,9 +126,12 @@
        for (Car car:list2){
            for (Car car1:list){
                if (car.getId().equals(car1.getId())){
                    car1.setAmount(car.getAmount());
                    car1.setMileage(car.getMileage());
                    car1.setMoney(car.getMoney());
                    car1.setAmount(Double.parseDouble(df.format(car.getAmount())));
                    car1.setMileage(Double.parseDouble(df.format(car.getMileage())));
                    car1.setMoney(Double.parseDouble(df.format(car.getMoney())));
                    car1.setAllAmount(Double.parseDouble(df.format(car1.getAllAmount())));
                    car1.setAllMileage(Double.parseDouble(df.format(car1.getAllMileage())));
                    car1.setAllMoney(Double.parseDouble(df.format(car1.getAllMoney())));
                    continue;
                }
            }
@@ -141,9 +154,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("操作失败");
    }