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/mapper/EvaluateTaskReferrerMapper.xml | 7 ++++++-
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java | 14 ++++++++++++++
2 files changed, 20 insertions(+), 1 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 2c7a088..d25234b 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -114,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));
+ }
+
/**
* 第一轮投票结果导出数据
*/
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
index dd989bd..3cb6981 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
@@ -59,7 +59,12 @@
where a.user_id = b.user_id and a.evaluate_task_id = c.evaluate_task_id and b.is_deleted = 0
) as isAddCandidate
from yw_evaluate_task_referrer a
- where a.is_deleted = 0 and evaluate_task_id = #{evaluateTaskReferrer.evaluateTaskId}
+ <where>
+ and a.is_deleted = 0 and evaluate_task_id = #{evaluateTaskReferrer.evaluateTaskId}
+ <if test="evaluateTaskReferrer.evaluateTaskCategoryId !=null and evaluateTaskReferrer.evaluateTaskCategoryId !=''">
+ and evaluate_task_category_id = #{evaluateTaskReferrer.evaluateTaskCategoryId}
+ </if>
+ </where>
group by user_id order by dept_id,voteNum DESC
</select>
--
Gitblit v1.9.3