From 496ba538494ab204aaac16aaf8d3bacf5a15acdb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 14:36:14 +0800
Subject: [PATCH] 注释
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 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 cd72bfa..c3d68a7 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
@@ -33,8 +33,10 @@
import org.springblade.core.tool.utils.DateUtil;
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.EvaluateCandidateResultExcel;
import org.springblade.modules.evaluate.service.IEvaluateCandidateResultService;
+import org.springblade.modules.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.vo.EvaluateCandidateResultVO;
import org.springblade.modules.evaluate.wrapper.EvaluateCandidateResultWrapper;
import org.springframework.web.bind.annotation.*;
@@ -59,6 +61,8 @@
private final IEvaluateCandidateResultService evaluateCandidateResultService;
+ private final IEvaluateTaskService evaluateTaskService;
+
/**
* 评优任务候选人投票结果表 详情
*/
@@ -81,6 +85,31 @@
}
/**
+ * 公司投票和部门投票根据用户或者部门汇总
+ * @param evaluateCandidateResult
+ * @param query
+ * @return
+ */
+ @GetMapping("/listByCategoryId")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入evaluateCandidateResult")
+ public R listByCategoryId(EvaluateCandidateResultEntity evaluateCandidateResult,Query query) {
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("evaluate_task_category_id", evaluateCandidateResult.getEvaluateTaskCategoryId());
+ queryWrapper.select("*,count(*) voteNum");
+ EvaluateTaskEntity taskEntity = evaluateTaskService.getById(evaluateCandidateResult.getEvaluateTaskId());
+ if (taskEntity.getType() == 0) {
+ queryWrapper.groupBy("user_id");
+ } else {
+ queryWrapper.groupBy("dept_id");
+ }
+
+ queryWrapper.orderByDesc("count(*)");
+
+ return R.data(evaluateCandidateResultService.pageMaps(Condition.getPage(query), queryWrapper));
+ }
+
+ /**
* 评优任务候选人投票结果表 自定义分页
*/
@GetMapping("/page")
--
Gitblit v1.9.3