From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/EvaluateMapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 52c34f7..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
@@ -8,6 +8,7 @@
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;
@@ -26,10 +27,10 @@
* 订单评价分页列表
*
* @param request 查询参数
- * @param page 分页
* @return 分页
*/
- Page<EvaluatePageVO> queryPageList(@Param("data") EvaluatePageRequest request, Page<EvaluatePageVO> page);
+ List<EvaluatePageVO> queryPageList(@Param("data") EvaluatePageRequest request);
+ List<EvaluatePageVO> queryPageListNoLimit(@Param("data") EvaluatePageRequest request);
/**
* 用户所关联评价记录分页列表
@@ -39,7 +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, 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