From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
index bc95d95..f674e78 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.User;
+import com.ruoyi.admin.service.UserService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
@@ -23,6 +26,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -41,6 +45,8 @@
private EvaluateClient evaluateClient;
@Resource
private TokenService tokenService;
+ @Resource
+ private UserService userService;
/**
* 订单评价分页列表
@@ -69,6 +75,13 @@
if (loginUser.getIsFranchisee()) {
cityList = loginUser.getCityList();
}
+ List<User> userList;
+ if (StringUtils.isNotBlank(userNo)) {
+ userList = userService.lambdaQuery().like(User::getNickname, userNo).list();
+ } else {
+ userList = new ArrayList<>();
+ }
+ List<Integer> userIdList = userList.stream().map(User::getId).collect(Collectors.toList());
EvaluatePageRequest evaluatePageRequest = new EvaluatePageRequest();
evaluatePageRequest.setUserNo(userNo);
evaluatePageRequest.setOrderNumber(orderNumber);
@@ -76,7 +89,16 @@
evaluatePageRequest.setCityList(cityList);
evaluatePageRequest.setPageNum(pageNum);
evaluatePageRequest.setPageSize(pageSize);
- return evaluateClient.queryPageList(evaluatePageRequest);
+ evaluatePageRequest.setUserIdList(userIdList);
+ R<Page<EvaluatePageVO>> r = evaluateClient.queryPageList(evaluatePageRequest);
+ for (EvaluatePageVO record : r.getData().getRecords()) {
+ Integer userId = record.getUserId();
+ User user = userService.getById(userId);
+ if (null != user) {
+ record.setUserNo(user.getNickname());
+ }
+ }
+ return r;
}
/**
--
Gitblit v1.7.1