From 6133859f01c1270a99156d5674d064cd03bf087c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 八月 2025 10:58:21 +0800
Subject: [PATCH] 订单导出修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java
index ffe7d52..41c0f90 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java
@@ -3,10 +3,14 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.order.entity.Evaluate;
+import com.ruoyi.order.request.EvaluatePageRequest;
import com.ruoyi.order.vo.EvaluatePageVO;
import com.ruoyi.order.vo.OrderEvaluateVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* <p>
@@ -22,14 +26,11 @@
/**
* 订单评价分页列表
*
- * @param userName 评价用户
- * @param orderNumber 订单编号
- * @param workerName 师傅姓名
- * @param page 分页
+ * @param request 查询参数
* @return 分页
*/
- Page<EvaluatePageVO> queryPageList(@Param("userName") String userName, @Param("orderNumber") String orderNumber,
- @Param("workerName") String workerName, Page<EvaluatePageVO> page);
+ List<EvaluatePageVO> queryPageList(@Param("data") EvaluatePageRequest request);
+ List<EvaluatePageVO> queryPageListNoLimit(@Param("data") EvaluatePageRequest request);
/**
* 用户所关联评价记录分页列表
@@ -39,6 +40,7 @@
* @return 分页列表
*/
Page<EvaluatePageVO> evaluateList(@Param("userId") Integer userId, Page<EvaluatePageVO> page);
+ Page<EvaluatePageVO> evaluateList1(@Param("cityList") List<String> cityList, @Param("userId") Integer userId, @Param("siteIds") List<String> siteIds, Page<EvaluatePageVO> page);
/**
* 订单与评价列表
--
Gitblit v1.7.1