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/EvaluateCandidateResultController.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 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 2c37e90..13cfcff 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
@@ -34,6 +34,8 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.evaluate.entity.EvaluateCandidateResultEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
+import org.springblade.modules.evaluate.excel.DeptResultGroupExcel;
+import org.springblade.modules.evaluate.excel.EmployeeResultGroupExcel;
import org.springblade.modules.evaluate.excel.EvaluateCandidateResultExcel;
import org.springblade.modules.evaluate.service.IEvaluateCandidateResultService;
import org.springblade.modules.evaluate.service.IEvaluateTaskService;
@@ -126,6 +128,20 @@
}
/**
+ * 公司投票详情集合 分页
+ * @param evaluateTaskReferrer
+ * @param query
+ * @return
+ */
+ @GetMapping("/resultList")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入evaluateTaskReferrer")
+ public R<IPage<EvaluateCandidateResultVO>> resultList(EvaluateCandidateResultVO evaluateTaskReferrer, Query query) {
+ IPage<EvaluateCandidateResultVO> pages = evaluateCandidateResultService.selectCandidateResultInfoPage(Condition.getPage(query), evaluateTaskReferrer);
+ return R.data(pages);
+ }
+
+ /**
* 评优任务候选人投票结果表 新增
*/
@PostMapping("/save")
@@ -189,4 +205,30 @@
ExcelUtil.export(response, "评优任务候选人投票结果表数据" + DateUtil.time(), "评优任务候选人投票结果表数据表", list, EvaluateCandidateResultExcel.class);
}
+ @GetMapping("/exportEmp/{taskId}")
+ @ApiOperationSupport(order = 9)
+ @ApiOperation(value = "公司评优结果导出数据", notes = "传入evaluateTaskReferrer")
+ 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");
+ List<EmployeeResultGroupExcel> list = evaluateCandidateResultService.exportEmployeeResultGroupExcel(queryWrapper);
+ ExcelUtil.export(response, "最终评优结果" + DateUtil.time(), "投票结果数据", list, EmployeeResultGroupExcel.class);
+ }
+
+ @GetMapping("/exportDept/{taskId}")
+ @ApiOperationSupport(order = 9)
+ @ApiOperation(value = "公司评优结果导出数据", notes = "传入evaluateTaskReferrer")
+ public void exprotDeptResultGroupExcel(@PathVariable("taskId") Long taskId, HttpServletResponse response) {
+ QueryWrapper queryWrapper = new QueryWrapper();
+ 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