From 24e01e7f50bbfccf880b062a9a2a91efd61055b8 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 11:23:08 +0800
Subject: [PATCH] 导出修改
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
index 22ddb25..4f3ec6b 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
@@ -211,8 +211,9 @@
public void exprotEmployeeResultGroupExcel(@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("user_id");
+ queryWrapper.groupBy("a.user_id,a.evaluate_task_category_id");
List<EmployeeResultGroupExcel> list = evaluateCandidateResultService.exportEmployeeResultGroupExcel(queryWrapper);
ExcelUtil.export(response, "最终评优结果" + DateUtil.time(), "投票结果数据", list, EmployeeResultGroupExcel.class);
}
--
Gitblit v1.9.3