From 3dccfd47f114dbbbab6bfa5843f40c8e6415b652 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 23 Jan 2024 11:25:44 +0800
Subject: [PATCH] 按奖项id筛选
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java | 21 ++++++++++++++++++---
1 files changed, 18 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..3ba0780 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
@@ -128,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")
@@ -197,7 +211,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 +222,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