From 8aa5c669bc1b46be539f56a4b2ec35d977422e59 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 10 七月 2024 21:15:45 +0800
Subject: [PATCH] 分表
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 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 8af2110..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
@@ -1,21 +1,26 @@
package com.ruoyi.management.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.management.domain.TFeedback;
+import com.ruoyi.management.domain.TUseGuide;
import com.ruoyi.management.dto.FeedbackQuery;
+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;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -32,7 +37,15 @@
@Autowired
private ITFeedbackService feedbackService;
+ @PostMapping("/addFeedBack")
+ @ApiOperation(value = "反馈", tags = {"家长端-意见反馈"})
+ public R addFeedBack(@RequestBody TFeedback dto) {
+ feedbackService.save(dto);
+ return R.ok();
+ }
+ @Autowired
+ private StudyClient studyClient;
@ResponseBody
@PostMapping("/listAll")
@ApiOperation(value = "列表查询", tags = {"反馈管理"})
@@ -43,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