From fcd66f067b1bc5ef617ee0f1044463ad3f532ee4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 10 Jan 2024 10:36:40 +0800
Subject: [PATCH] 被考核人投票结果按名称、部门名称过滤
---
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
index 4eb36f0..d6d060d 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
@@ -94,25 +94,18 @@
@GetMapping("/listGroupByTask/{type}/{taskId}")
@ApiOperation(value = "后台考核任务考核结果", notes = "传入要查询的任务id")
- public R listGroupByTask(@ApiIgnore @PathVariable Integer type,@PathVariable Long taskId, Query query) {
- QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
- setEntityQueryWrapper.select("id,assessment_task_id,be_id,score_user_id,SUM(weight*score_val*0.01) as score_val,type");
- setEntityQueryWrapper.eq("type", type);
- setEntityQueryWrapper.eq("assessment_task_id",taskId);
- setEntityQueryWrapper.groupBy("be_id");
- IPage<AssessmentScoreEntity> pages = assessmentScoreService.page(Condition.getPage(query),setEntityQueryWrapper);
+ public R listGroupByTask(@ApiIgnore @PathVariable Integer type,@PathVariable Long taskId, Query query, AssessmentScoreVO assessmentScore) {
+// QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
+// setEntityQueryWrapper.select("id,assessment_task_id,be_id,score_user_id,SUM(weight*score_val*0.01) as score_val,type");
+// setEntityQueryWrapper.eq("type", type);
+// setEntityQueryWrapper.eq("assessment_task_id",taskId);
+// setEntityQueryWrapper.groupBy("be_id");
+// IPage<AssessmentScoreEntity> pages = assessmentScoreService.page(Condition.getPage(query),setEntityQueryWrapper);
+ assessmentScore.setType(type);
+ assessmentScore.setAssessmentTaskId(taskId);
+ IPage<AssessmentScoreEntity> pages = assessmentScoreService.selectAssessmentScoreGroupByBeidPage(Condition.getPage(query), assessmentScore);
return R.data(AssessmentScoreWrapper.build().pageVO(pages));
- }
-
- @GetMapping("/listResultScore/{taskId}/{userId}")
- @ApiOperation(value = "后台考核任务考核结果", notes = "传入要查询的任务id")
- public R listResultScore(@PathVariable Long taskId,@PathVariable Long userId) {
- QueryWrapper<AssessmentSetAssessorEntity> assessmentSetAssessorEntityQueryWrapper = new QueryWrapper<>();
- assessmentSetAssessorEntityQueryWrapper.eq("",taskId);
- assessmentSetAssessorEntityQueryWrapper.eq("",userId);
-
- return null;
}
@GetMapping("/listMyScore/{userId}")
--
Gitblit v1.9.3