From 3d88793efc19e5c8dc4700edff4ccbbbec9dbd01 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 18 Dec 2023 11:13:13 +0800
Subject: [PATCH] 当前部门候选人
---
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 03052c7..7bf8318 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
@@ -92,18 +92,17 @@
return R.data(AssessmentScoreWrapper.build().pageVO(pages));
}
- @GetMapping("/listGroupByTask/{scoreUserId}")
- @ApiOperation(value = "我的得分列表", notes = "传入要查询的用户id")
- public R listGroupByTask(@ApiIgnore @PathVariable Long scoreUserId) {
+ @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("be_id",scoreUserId);
- setEntityQueryWrapper.eq("type", 0l);
- setEntityQueryWrapper.groupBy("assessment_task_id");
- List<AssessmentScoreEntity> list = assessmentScoreService.list(setEntityQueryWrapper);
- List<AssessmentScoreVO> voList = AssessmentScoreWrapper.build().listVO(list);
+ setEntityQueryWrapper.eq("type", type);
+ setEntityQueryWrapper.eq("assessment_task_id",taskId);
+ setEntityQueryWrapper.groupBy("be_id");
+ IPage<AssessmentScoreEntity> pages = assessmentScoreService.page(Condition.getPage(query),setEntityQueryWrapper);
- return R.data(voList);
+ return R.data(AssessmentScoreWrapper.build().pageVO(pages));
}
@GetMapping("/listMyScore/{userId}")
--
Gitblit v1.9.3