From c485aa1d929684f5edefb2b427847df71a6a7466 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 12 Jan 2024 10:17:35 +0800
Subject: [PATCH] 公司评优结果和部门评优结果导出
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 aaf01e5..6e59a7e 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
@@ -197,7 +197,7 @@
public void exprotEmployeeResultGroupExcel(@PathVariable("taskId") Long taskId, HttpServletResponse response) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("a.evaluate_task_id", taskId);
- queryWrapper.orderByDesc("b.category_name,a.dept_name,a.count(*)");
+ queryWrapper.orderByDesc("b.id,voteNUm");
queryWrapper.groupBy("user_id");
List<EmployeeResultGroupExcel> list = evaluateCandidateResultService.exportEmployeeResultGroupExcel(queryWrapper);
ExcelUtil.export(response, "最终评优结果" + DateUtil.time(), "投票结果数据", list, EmployeeResultGroupExcel.class);
@@ -208,8 +208,9 @@
@ApiOperation(value = "公司评优结果导出数据", notes = "传入evaluateTaskReferrer")
public void exprotDeptResultGroupExcel(@PathVariable("taskId") Long taskId, HttpServletResponse response) {
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("a.evaluate_task_id", taskId);
- queryWrapper.orderByDesc("a.count(*)");
+ queryWrapper.eq("evaluate_task_id", taskId);
+ queryWrapper.isNull("user_id");
+ queryWrapper.orderByDesc("voteNum");
queryWrapper.groupBy("dept_id");
List<DeptResultGroupExcel> list = evaluateCandidateResultService.exportDeptResultGroupExcel(queryWrapper);
ExcelUtil.export(response, "最终评优结果" + DateUtil.time(), "投票结果数据", list, DeptResultGroupExcel.class);
--
Gitblit v1.9.3