From 3044a637a15e09d50ad733fd482c6e64e90df2f9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 六月 2025 17:46:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
index 0263b89..90e9d92 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
@@ -105,14 +105,14 @@
*/
Page<Order> queryPage(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);
Page<Order> queryPage1(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);
-
+ List<Order> excelExportList(@Param("data") OrderQueryRequest orderQueryRequest);
/**
* 订单管理分页模块，订单数量统计
*
* @param orderQueryRequest 筛选参数
* @return 统计数量
*/
- List<Order> orderPageCount(@Param("data") OrderQueryRequest orderQueryRequest);
+ Order orderPageCount(@Param("data") OrderQueryRequest orderQueryRequest);
/**
* 根据所选id查询
@@ -138,7 +138,7 @@
* @param page 分页
* @return 交易额
*/
- Page<Order> orderListWorker(@Param("userId") Integer userId, @Param("state") Integer state, Page<Order> page);
+ Page<Order> orderListWorker(@Param("userId") Integer userId, @Param("state") Integer state,@Param("searchValues")String searchValues, Page<Order> page);
/**
* 师傅端-根据师傅id获取订单数量
--
Gitblit v1.7.1