From 70857448956877f33d49f7df78fb0b4b5d360695 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 15 Jan 2024 11:35:50 +0800
Subject: [PATCH] 第一轮结果返回是否添加了候选人字段
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 6af1ffc..f229c74 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -104,12 +104,15 @@
*/
@GetMapping("/list/{taskId}")
public R listByTaskId(@PathVariable("taskId") Long taskId, 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));
+// 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);
+ return R.data(evaluateTaskReferrerService.selectEvaluateTaskReferrerMapPage(Condition.getPage(query), evaluateTaskReferrerVO));
}
/**
--
Gitblit v1.9.3