From 9c1d7ce35cc8c7dc81e0b259fb3b52211aa2f1bf Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期三, 09 二月 2022 13:55:11 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java | 8 +++++---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java | 13 +++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java | 5 +++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java | 9 +++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java | 4 ++++
5 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
index 83d86bb..d7453ef 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
+++ b/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);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
index 85ff69c..0536c27 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
+++ b/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;
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java
index f4db9f4..66d3564 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java
+++ b/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);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java
index 5d5d549..c7c257f 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java
+++ b/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);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java
index 21086e7..04da32b 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java
+++ b/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);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1