From b62fdf04bc9bd36d4992847128bfd40292c3cac1 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 09 十一月 2021 15:02:03 +0800
Subject: [PATCH] 意见建议

---
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICarService.java         |    4 ++++
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICarServiceImpl.java |    8 ++++++++
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CarMapper.java            |   13 +++++++++++++
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java    |    4 ++--
 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java                  |   10 ++++++++++
 5 files changed, 37 insertions(+), 2 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 6737958..c372cc9 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
@@ -54,9 +54,9 @@
     public Result<IPage<Car>> getByPage(String carNo,PageVo page) {
         QueryWrapper<Car> wrapper = new QueryWrapper<>();
         if(!StrUtil.isEmpty(carNo)){
-            wrapper.like("car_no","%"+carNo+"%");
+            wrapper.like("a.car_no","%"+carNo+"%");
         }
-        IPage<Car> data = iCarService.page(PageUtil.initMpPage(page),wrapper);
+        IPage<Car> data = iCarService.page2(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/entity/Car.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java
index 954c96f..be3b527 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java
@@ -1,6 +1,7 @@
 package cn.exrick.xboot.your.entity;
 
 import cn.exrick.xboot.core.base.XbootBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -12,6 +13,7 @@
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 
 /**
@@ -57,4 +59,12 @@
     @ApiModelProperty(value = "褰撳墠璺熻溅浜篿d")
     private String followUserId;
 
+    @Transient
+    @TableField(exist = false)
+    private String nickName;
+
+    @Transient
+    @TableField(exist = false)
+    private String followNickName;
+
 }
\ No newline at end of file
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 daf8baf..696a084 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
@@ -1,8 +1,17 @@
 package cn.exrick.xboot.your.mapper;
+import cn.exrick.xboot.your.entity.Area;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.exrick.xboot.your.entity.Car;
+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;
 
@@ -11,4 +20,8 @@
  * @author zhangzeli
  */
 public interface CarMapper extends BaseMapper<Car> {
+
+    @Select("SELECT a.*,b1.nickname AS temp,b2.nickname AS followNickName FROM t_car a LEFT JOIN t_user AS b1 ON a.user_id = b1.id LEFT JOIN t_user AS b2 ON a.follow_user_id = b2.id ${ew.customSqlSegment} ")
+    @Results({@Result(column="temp", property="nickName", jdbcType = JdbcType.VARCHAR)})
+    IPage<Car> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<Car> wrapper);
 }
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICarService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICarService.java
index 2ea152f..87bfa31 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICarService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICarService.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.Car;
 
@@ -11,4 +14,5 @@
  */
 public interface ICarService extends IService<Car> {
 
+    IPage<Car> page2(Page initMpPage, QueryWrapper<Car> wrapper);
 }
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICarServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICarServiceImpl.java
index b6dd91a..65268cf 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICarServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICarServiceImpl.java
@@ -3,6 +3,9 @@
 import cn.exrick.xboot.your.mapper.CarMapper;
 import cn.exrick.xboot.your.entity.Car;
 import cn.exrick.xboot.your.service.ICarService;
+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;
@@ -23,4 +26,9 @@
 
     @Autowired
     private CarMapper carMapper;
+
+    @Override
+    public IPage<Car> page2(Page initMpPage, QueryWrapper<Car> wrapper) {
+        return carMapper.page2(initMpPage,wrapper);
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1