From 13c9e4032de40598787a453de77ba0db94666664 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期四, 25 五月 2023 15:53:07 +0800
Subject: [PATCH] 接货图片和签收图片的完善
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java
index 5be2972..8469616 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTask2Controller.java
@@ -49,9 +49,21 @@
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
- public Result<IPage<OrderTask2>> getByPage(PageVo page) {
-
- IPage<OrderTask2> data = iOrderTask2Service.page(PageUtil.initMpPage(page));
+ public Result<IPage<OrderTask2>> getByPage(PageVo page,String sendDate,String userName,String customerName,Integer status) {
+ QueryWrapper<OrderTask2> wrapper = new QueryWrapper<>();
+ if(StrUtil.isNotEmpty(sendDate)){
+ wrapper.eq("send_date",sendDate);
+ }
+ if(StrUtil.isNotEmpty(userName)){
+ wrapper.like("user_name","%"+userName+"%");
+ }
+ if(StrUtil.isNotEmpty(customerName)){
+ wrapper.like("customer_name","%"+customerName+"%");
+ }
+ if(status!=null){
+ wrapper.eq("status",status);
+ }
+ IPage<OrderTask2> data = iOrderTask2Service.page(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<OrderTask2>>().setData(data);
}
--
Gitblit v1.9.1