From 340e172bd5626038fe96c786220a3f4bb322a15e Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 09 十一月 2021 14:55:39 +0800
Subject: [PATCH] 意见建议
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java | 8 +++++---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java | 13 ++++++++++++-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerReceiveService.java | 4 ++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerReceiveServiceImpl.java | 8 ++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerReceiveMapper.java | 12 ++++++++++++
5 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
index 665ad44..bed5276 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
@@ -49,9 +49,11 @@
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
- public Result<IPage<CustomerReceive>> getByPage(PageVo page) {
-
- IPage<CustomerReceive> data = iCustomerReceiveService.page(PageUtil.initMpPage(page));
+ public Result<IPage<CustomerReceive>> getByPage(String name,PageVo page) {
+ QueryWrapper<CustomerReceive> wrapper = new QueryWrapper<>();
+ if (!StrUtil.isEmpty(name))
+ wrapper.like("b.name","%"+name+"%");
+ IPage<CustomerReceive> data = iCustomerReceiveService.page2(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<CustomerReceive>>().setData(data);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java
index ae9c813..5694649 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.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;
/**
@@ -28,7 +30,7 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鍖哄煙id")
+ @ApiModelProperty(value = "鍟嗘埛id")
private String customerId;
@ApiModelProperty(value = "鍚嶇О")
@@ -37,4 +39,13 @@
@ApiModelProperty(value = "鑱旂郴鏂瑰紡")
private String phone;
+ @ApiModelProperty(value = "鐘舵��(0:寰呭鏍� 1锛氬鏍搁�氳繃 2锛氬鏍告湭閫氳繃)")
+ private int status;
+
+ @ApiModelProperty(value = "鏈�氳繃鍘熷洜")
+ private String content;
+
+ @Transient
+ @TableField(exist = false)
+ private String customerName;
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerReceiveMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerReceiveMapper.java
index c7bdda0..04ff101 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerReceiveMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerReceiveMapper.java
@@ -1,7 +1,16 @@
package cn.exrick.xboot.your.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.CustomerReceive;
+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;
@@ -11,4 +20,7 @@
*/
public interface CustomerReceiveMapper extends BaseMapper<CustomerReceive> {
+ @Select("SELECT a.*,b.name as temp FROM t_customer_receive a LEFT JOIN t_customer b ON a.customer_id=b.id ${ew.customSqlSegment} ORDER BY a.status ASC,a.create_time DESC")
+ @Results({@Result(column="temp", property="customerName", jdbcType = JdbcType.VARCHAR)})
+ IPage<CustomerReceive> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<CustomerReceive> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerReceiveService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerReceiveService.java
index 79f8046..c60ed54 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerReceiveService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerReceiveService.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.CustomerReceive;
@@ -11,4 +14,5 @@
*/
public interface ICustomerReceiveService extends IService<CustomerReceive> {
+ IPage<CustomerReceive> page2(Page initMpPage, QueryWrapper<CustomerReceive> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerReceiveServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerReceiveServiceImpl.java
index abb4150..e0d900f 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerReceiveServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerReceiveServiceImpl.java
@@ -3,6 +3,9 @@
import cn.exrick.xboot.your.mapper.CustomerReceiveMapper;
import cn.exrick.xboot.your.entity.CustomerReceive;
import cn.exrick.xboot.your.service.ICustomerReceiveService;
+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 CustomerReceiveMapper customerReceiveMapper;
+
+ @Override
+ public IPage<CustomerReceive> page2(Page initMpPage, QueryWrapper<CustomerReceive> wrapper) {
+ return customerReceiveMapper.page2(initMpPage,wrapper);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1