bug
zhangzeli
2022-02-09 9c1d7ce35cc8c7dc81e0b259fb3b52211aa2f1bf
bug
5个文件已修改
39 ■■■■■ 已修改文件
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
@@ -117,9 +117,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);
    }
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
@@ -114,4 +114,8 @@
    @Transient
    @TableField(exist = false)
    private double endMileage;
    @Transient
    @TableField(exist = false)
    private String carNo;
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java
@@ -1,8 +1,17 @@
package cn.exrick.xboot.your.mapper;
import cn.exrick.xboot.your.entity.Suggest;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.DrivingRecord;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.type.JdbcType;
import java.util.List;
@@ -23,4 +32,8 @@
    @Select("select count(id) from t_driving_record where yin_huan=1")
    int count2();
    @Select("SELECT a.*,b.car_no as carNo FROM t_driving_record a LEFT JOIN t_car b ON a.car_id=b.id ${ew.customSqlSegment} ")
    @Results({@Result(column="carNo", property="carNo", jdbcType = JdbcType.VARCHAR)})
    IPage<DrivingRecord> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<DrivingRecord> wrapper);
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java
@@ -1,5 +1,8 @@
package cn.exrick.xboot.your.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.exrick.xboot.your.entity.DrivingRecord;
@@ -18,4 +21,6 @@
    int sumLikeByUserId(String id);
    int count2();
    IPage<DrivingRecord> page2(Page initMpPage, QueryWrapper<DrivingRecord> wrapper);
}
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java
@@ -1,8 +1,12 @@
package cn.exrick.xboot.your.serviceimpl;
import cn.exrick.xboot.your.entity.AddOil;
import cn.exrick.xboot.your.mapper.DrivingRecordMapper;
import cn.exrick.xboot.your.entity.DrivingRecord;
import cn.exrick.xboot.your.service.IDrivingRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,4 +52,9 @@
    public int count2() {
        return drivingRecordMapper.count2();
    }
    @Override
    public IPage<DrivingRecord> page2(Page initMpPage, QueryWrapper<DrivingRecord> wrapper) {
        return drivingRecordMapper.page2(initMpPage,wrapper);
    }
}