1.首页分段显示 2.配送订单页可根据分段显示 3.后端配送率统计

wjli

2023-05-11 a067fdbf6b1374a1402096c722257575916eab99

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

@@ -51,6 +51,32 @@
        }

        record.setDrivingDate(DateUtil.parse(format));

        int flag=0;
        if(record.getSanZheng()!=0){
            flag++;
        }else if(record.getSanLiang()!=0){
            flag++;
        }else if(record.getAnQuan()!=0){
            flag++;
        }else if(record.getHouShiJing()!=0){
            flag++;
        }else if(record.getLaBa()!=0){
            flag++;
        }else if(record.getLunTai()!=0){
            flag++;
        }else if(record.getQiTa()!=0){
            flag++;
        }else if(record.getSiDeng()!=0){
            flag++;
        }else if(record.getYiBiao()!=0){
            flag++;
        }else if(record.getYuShuaQi()!=0){
            flag++;
        }
        if(flag>0){
            record.setYinHuan(1);
        }
        iDrivingRecordService.saveOrUpdate(record);
        return ResultUtil.success("操作成功");
    }
@@ -58,11 +84,21 @@
    @RequestMapping(value = "/updateMileage", method = RequestMethod.POST)
    @ApiOperation(value = "添加行车记录")
    public Result<DrivingRecord> updateMileage(String carId,int mileage,String userId,String inDate) {
        if(StrUtil.isEmpty(userId)){
            return ResultUtil.error("参数不完整");
        }
        if(StrUtil.isEmpty(carId)){
            return ResultUtil.error("参数不完整");
        }
        String format = DateUtil.format(new Date(), "yyyy-MM-dd");
        QueryWrapper<DrivingRecord> wrapper = new QueryWrapper<>();
        wrapper.eq("driving_date",format);
        wrapper.eq("car_id",carId);
        DrivingRecord drivingRecord = iDrivingRecordService.getOne(wrapper);
        if(drivingRecord==null){
            drivingRecord = new DrivingRecord();
            drivingRecord.setCarId(carId);
        }
        drivingRecord.setMileage(mileage);
        drivingRecord.setInTime(DateUtil.parseDate(inDate));
        drivingRecord.setUserId(userId);
@@ -88,9 +124,11 @@

    @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
    @ApiOperation(value = "分页获取")
    public Result<IPage<DrivingRecord>> getByPage(PageVo page) {

        IPage<DrivingRecord> data = iDrivingRecordService.page(PageUtil.initMpPage(page));
    public Result<IPage<DrivingRecord>> getByPage(PageVo page,String carNo) {
        QueryWrapper<DrivingRecord> wrapper = new QueryWrapper<>();
        if(!StrUtil.isEmpty(carNo))
            wrapper.like("b.car_no","%"+carNo+"%");
        IPage<DrivingRecord> data = iDrivingRecordService.page2(PageUtil.initMpPage(page),wrapper);
        return new ResultUtil<IPage<DrivingRecord>>().setData(data);
    }