From 3dccfd47f114dbbbab6bfa5843f40c8e6415b652 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 23 Jan 2024 11:25:44 +0800
Subject: [PATCH] 按奖项id筛选
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
index f229c74..d25234b 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -18,7 +18,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -115,6 +114,20 @@
return R.data(evaluateTaskReferrerService.selectEvaluateTaskReferrerMapPage(Condition.getPage(query), evaluateTaskReferrerVO));
}
+ @GetMapping("/list/{taskId}/{evaluateTaskCategoryId}")
+ public R listByTaskIdAndCategoryId(@PathVariable("taskId") Long taskId, @PathVariable("evaluateTaskCategoryId") Long evaluateTaskCategoryId, Query query) {
+// QueryWrapper queryWrapper = new QueryWrapper();
+// queryWrapper.select("*, count(*) as voteNum");
+// queryWrapper.eq("evaluate_task_id", taskId);
+// queryWrapper.orderByDesc("dept_name,count(*)");
+// queryWrapper.groupBy("user_id");
+// return R.data(evaluateTaskReferrerService.pageMaps(Condition.getPage(query), queryWrapper));
+ EvaluateTaskReferrerVO evaluateTaskReferrerVO = new EvaluateTaskReferrerVO();
+ evaluateTaskReferrerVO.setEvaluateTaskId(taskId);
+ evaluateTaskReferrerVO.setEvaluateTaskCategoryId(evaluateTaskCategoryId);
+ return R.data(evaluateTaskReferrerService.selectEvaluateTaskReferrerMapPage(Condition.getPage(query), evaluateTaskReferrerVO));
+ }
+
/**
* 第一轮投票结果导出数据
*/
@@ -123,13 +136,9 @@
@ApiOperation(value = "导出数据", notes = "传入evaluateTaskReferrer")
public void exportListByTaskId(@PathVariable("taskId") Long taskId, HttpServletResponse response) {
QueryWrapper queryWrapper = new QueryWrapper();
-// queryWrapper.select("*, count(*) as voteNum");
- queryWrapper.eq("evaluate_task_id", taskId);
- queryWrapper.orderByDesc("dept_name,count(*)");
- queryWrapper.groupBy("user_id");
- Page page = new Page();
- page.setSize(1);
- page.setCurrent(9999);
+ queryWrapper.eq("a.evaluate_task_id", taskId);
+ queryWrapper.orderByDesc("a.evaluate_task_category_id,a.dept_id,voteNum");
+ queryWrapper.groupBy("a.user_id");
List<ReferrerResultGroupExcel> list = evaluateTaskReferrerService.exportListByTaskId(queryWrapper);
--
Gitblit v1.9.3