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/service/impl/EvaluateServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 d3263b4..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
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.entity.Evaluate;
import com.ruoyi.order.mapper.EvaluateMapper;
+import com.ruoyi.order.request.EvaluatePageRequest;
import com.ruoyi.order.service.EvaluateService;
import com.ruoyi.order.vo.EvaluatePageVO;
import com.ruoyi.order.vo.OrderEvaluateVO;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -21,8 +24,14 @@
public class EvaluateServiceImpl extends ServiceImpl<EvaluateMapper, Evaluate> implements EvaluateService {
@Override
- public Page<EvaluatePageVO> queryPageList(String userName, String orderNumber, String workerName, Page<EvaluatePageVO> page) {
- return baseMapper.queryPageList(userName, orderNumber, workerName, page);
+ public Page<EvaluatePageVO> queryPageList(EvaluatePageRequest request, Page<EvaluatePageVO> 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
@@ -31,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