From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6

---
 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..14c67c0 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 查询参数
+     * @param page    分页
      * @return 分页
      */
-    Page<EvaluatePageVO> queryPageList(@Param("userName") String userName, @Param("orderNumber") String orderNumber,
-                                       @Param("workerName") String workerName, Page<EvaluatePageVO> page);
+    Page<EvaluatePageVO> queryPageList(@Param("data") EvaluatePageRequest request, Page<EvaluatePageVO> page);
 
     /**
      * 用户所关联评价记录分页列表
@@ -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