From 6ac20c074838fbe3bb59a262eade2f8dda2f4ca3 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期三, 27 十月 2021 11:51:39 +0800
Subject: [PATCH] 车辆表后台

---
 xboot-modules/xboot-your/src/main/resources/mapper/CarMapper.xml                          |    8 --------
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java         |    2 --
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java |   11 ++++++++---
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
index 7fb1251..6737958 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
@@ -7,7 +7,9 @@
 import cn.exrick.xboot.your.entity.Car;
 import cn.exrick.xboot.your.service.ICarService;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -49,9 +51,12 @@
 
     @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
     @ApiOperation(value = "鍒嗛〉鑾峰彇")
-    public Result<IPage<Car>> getByPage(PageVo page) {
-
-        IPage<Car> data = iCarService.page(PageUtil.initMpPage(page));
+    public Result<IPage<Car>> getByPage(String carNo,PageVo page) {
+        QueryWrapper<Car> wrapper = new QueryWrapper<>();
+        if(!StrUtil.isEmpty(carNo)){
+            wrapper.like("car_no","%"+carNo+"%");
+        }
+        IPage<Car> data = iCarService.page(PageUtil.initMpPage(page),wrapper);
         return new ResultUtil<IPage<Car>>().setData(data);
     }
 
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java
index 1d8880b..daf8baf 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java
@@ -11,6 +11,4 @@
  * @author zhangzeli
  */
 public interface CarMapper extends BaseMapper<Car> {
-
-    Car getOneByCarNo(@Param("carNo") String carNo);
 }
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/resources/mapper/CarMapper.xml b/xboot-modules/xboot-your/src/main/resources/mapper/CarMapper.xml
index 6f35b98..efcad76 100644
--- a/xboot-modules/xboot-your/src/main/resources/mapper/CarMapper.xml
+++ b/xboot-modules/xboot-your/src/main/resources/mapper/CarMapper.xml
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.exrick.xboot.your.mapper.CarMapper">
-
-    <select id="getOneByCarNo" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from t_car
-        where
-        car_no = #{carNo,jdbcType=VARCHAR}
-    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1