From 13d5b569d54ca0f5c384bebb0fac2d43435a3ffa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 22 七月 2024 15:49:08 +0800
Subject: [PATCH] 添加学习配置 优化
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java
index 73e0bbe..4372e74 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java
@@ -12,6 +12,8 @@
import com.ruoyi.management.query.UseGuideQuery;
import com.ruoyi.management.service.ITFeedbackService;
import com.ruoyi.management.vo.FeedbackVO;
+import com.ruoyi.study.api.domain.TUser;
+import com.ruoyi.study.api.feignClient.StudyClient;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -42,6 +44,8 @@
return R.ok();
}
+ @Autowired
+ private StudyClient studyClient;
@ResponseBody
@PostMapping("/listAll")
@ApiOperation(value = "列表查询", tags = {"反馈管理"})
@@ -52,8 +56,35 @@
// query.getEndTime().setSeconds(59);
// }
List<FeedbackVO> list = feedbackService.listAll(query);
+ List<FeedbackVO> result = new ArrayList<>();
+ for (FeedbackVO feedbackVO : list) {
+ TUser data = studyClient.getUserById(feedbackVO.getUserId()).getData();
+ if (data == null )continue;
+
+ feedbackVO.setName(data.getName());
+ feedbackVO.setPhone(data.getPhone());
+ if (!StringUtils.hasLength(query.getPhone()) && !StringUtils.hasLength(query.getUserName())) {
+ result.add(feedbackVO);
+ continue;
+ }
+ // 如果筛选条件输入了电话或者姓名那么需要过滤掉不符合条件的数据
+ if (StringUtils.hasLength(query.getPhone()) && StringUtils.hasLength(query.getUserName())) {
+ if (feedbackVO.getPhone().contains(query.getPhone()) && feedbackVO.getName().contains(query.getUserName())) {
+ result.add(feedbackVO);
+ }
+ } else if (StringUtils.hasLength(query.getPhone())) {
+ if (feedbackVO.getPhone().contains(query.getPhone())) {
+ result.add(feedbackVO);
+ }
+ } else if (StringUtils.hasLength(query.getUserName())) {
+ if (feedbackVO.getName().contains(query.getUserName())) {
+ result.add(feedbackVO);
+ }
+ }
+ }
PageInfo<FeedbackVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- res.setRecords(list);
+ res.setTotal(result.size());
+ res.setRecords(result);
return AjaxResult.success(res);
}
--
Gitblit v1.7.1