From d90ac211d9168c1ce8d390838f367a0db00afb52 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 六月 2025 14:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/EvaluateService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/EvaluateService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/EvaluateService.java
index 230cbc5..4f0cd96 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/EvaluateService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/EvaluateService.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
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 java.util.List;
/**
* <p>
@@ -19,13 +22,11 @@
/**
* 订单评价分页列表
*
- * @param userName 评价用户
- * @param orderNumber 订单编号
- * @param workerName 师傅姓名
- * @param page 分页
+ * @param request 查询参数
+ * @param page 分页
* @return 分页
*/
- Page<EvaluatePageVO> queryPageList(String userName, String orderNumber, String workerName, Page<EvaluatePageVO> page);
+ Page<EvaluatePageVO> queryPageList(EvaluatePageRequest request, Page<EvaluatePageVO> page);
/**
* 用户所关联评价记录分页列表
@@ -35,6 +36,7 @@
* @return 分页列表
*/
Page<EvaluatePageVO> evaluateList(Integer userId, Page<EvaluatePageVO> page);
+ Page<EvaluatePageVO> evaluateList1(List<String> cityList,Integer userId, Page<EvaluatePageVO> page,List<String> siteIds);
/**
* 订单评价列表
--
Gitblit v1.7.1