From 6b96492c540e24cc29d55573c5816df808279825 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 10 七月 2024 16:10:17 +0800
Subject: [PATCH] 分表
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 05a896e..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,9 +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.setTotal(list.size());
- res.setRecords(list);
+ res.setTotal(result.size());
+ res.setRecords(result);
return AjaxResult.success(res);
}
--
Gitblit v1.7.1