From d2731c217410c70aaf46c016a572d836e9c1d91e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 20:07:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java
index 57b4ee1..b943ec9 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/EvaluateServiceImpl.java
@@ -10,6 +10,8 @@
import com.ruoyi.order.vo.OrderEvaluateVO;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* <p>
* 用户评价表 服务实现类
@@ -23,7 +25,13 @@
@Override
public Page<EvaluatePageVO> queryPageList(EvaluatePageRequest request, Page<EvaluatePageVO> page) {
- return baseMapper.queryPageList(request, page);
+ Page<EvaluatePageVO> evaluatePageVOPage1 = new Page<>();
+
+ List<EvaluatePageVO> evaluatePageVOPage = baseMapper.queryPageList(request);
+ int count = baseMapper.queryPageListNoLimit(request).size();
+ evaluatePageVOPage1.setRecords(evaluatePageVOPage);
+ evaluatePageVOPage1.setTotal( count);
+ return evaluatePageVOPage1;
}
@Override
@@ -32,6 +40,11 @@
}
@Override
+ public Page<EvaluatePageVO> evaluateList1(List<String> cityList,Integer userId, Page<EvaluatePageVO> page,List<String> siteIds) {
+ return baseMapper.evaluateList1(cityList,userId,siteIds, page);
+ }
+
+ @Override
public Page<OrderEvaluateVO> evaluateListByUser(Integer userId, Integer state, Page<OrderEvaluateVO> page) {
return baseMapper.evaluateListByUser(userId, state, page);
}
--
Gitblit v1.7.1