From e4ffdd005b01ca7cc54e335a813bc07b62216ad9 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 23 Jan 2024 14:15:56 +0800
Subject: [PATCH] 导出修改
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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..99fa029 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));
+ }
+
/**
* 第一轮投票结果导出数据
*/
@@ -123,6 +137,7 @@
public void exportListByTaskId(@PathVariable("taskId") Long taskId, HttpServletResponse response) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("a.evaluate_task_id", taskId);
+ queryWrapper.eq("a.is_deleted", 0);
queryWrapper.orderByDesc("a.evaluate_task_category_id,a.dept_id,voteNum");
queryWrapper.groupBy("a.user_id");
--
Gitblit v1.9.3