From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 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 0805dca..08bc08d 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
@@ -92,23 +93,31 @@
return R.data(AssessmentScoreWrapper.build().pageVO(pages));
}
+ /**
+ * 考核评分记录列表
+ * @param assessmentScore
+ * @param query
+ * @return
+ */
+ @GetMapping("/listInfo")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入assessmentScore")
+ public R<IPage<AssessmentScoreVO>> listInfo(AssessmentScoreVO assessmentScore, Query query) {
+ return R.data(assessmentScoreService.selectAssessmentScoreInfoV2Page(Condition.getPage(query), assessmentScore));
+ }
+
@GetMapping("/listGroupByTask/{type}/{taskId}")
@ApiOperation(value = "后台考核任务考核结果", notes = "传入要查询的任务id")
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);
//增加根据登录用户部门筛选
-// boolean isadmin = AuthUtil.isAdmin();
-// if (!isadmin) {
-// assessmentScore.setDeptName();
-// }
+ boolean isadmin = AuthUtil.isAdmin();
+ if (!isadmin) {
+ assessmentScore.setDeptId(AuthUtil.getDeptId());
+ }
IPage<AssessmentScoreEntity> pages = assessmentScoreService.selectAssessmentScoreGroupByBeidPage(Condition.getPage(query), assessmentScore);
--
Gitblit v1.9.3