From 63d5bf1bc414b71860b56e66c9dd7b3d8ed2157e Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 04 Jan 2024 17:34:36 +0800
Subject: [PATCH] 考核任务
---
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java | 80 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 19 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 7bf8318..3cd6912 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
@@ -28,15 +28,13 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.assessment.entity.AssessmentSetDeptEntity;
-import org.springblade.modules.assessment.entity.AssessmentSetEntity;
-import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
+import org.springblade.modules.assessment.entity.*;
+import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
import org.springblade.modules.assessment.service.IAssessmentSetService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.assessment.excel.AssessmentScoreExcel;
import org.springblade.modules.assessment.wrapper.AssessmentScoreWrapper;
@@ -66,10 +64,11 @@
public class AssessmentScoreController extends BladeController {
private final IAssessmentScoreService assessmentScoreService;
+ private final IAssessmentSetService assessmentSetService;
private final IAssessmentTaskService assessmentTaskService;
- private final IAssessmentSetService assessmentSetService;
+ private final IAssessmentSetAssessorService assessmentSetAssessorService;
/**
* 考核评分 详情
@@ -93,7 +92,7 @@
}
@GetMapping("/listGroupByTask/{type}/{taskId}")
- @ApiOperation(value = "评分列表", notes = "传入要查询的用户id")
+ @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");
@@ -105,28 +104,39 @@
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}")
@ApiOperation(value = "我的得分列表", notes = "传入要查询的用户id")
public R listMyScore(@ApiIgnore @PathVariable Long userId) {
- QueryWrapper<AssessmentTaskEntity> taskEntityQueryWrapper = new QueryWrapper<>();
- taskEntityQueryWrapper.eq("type", 0l);
- List<AssessmentTaskEntity> assessmentTaskEntityList = assessmentTaskService.list(taskEntityQueryWrapper);
+ QueryWrapper<AssessmentSetEntity> setEntityQueryWrapper = new QueryWrapper<>();
+ setEntityQueryWrapper.eq("user_id",userId);
+ List<AssessmentSetEntity> assessmentSetEntities = assessmentSetService.list(setEntityQueryWrapper);
+
List<Map<String,Object>> retList = new ArrayList<>();
- for (AssessmentTaskEntity po:assessmentTaskEntityList) {
+ for (AssessmentSetEntity po:assessmentSetEntities) {
+
Map<String,Object> map = new HashMap<>();
+ map.put("assessmentTaskVO", po);
- QueryWrapper<AssessmentSetEntity> setEntityQueryWrapper = new QueryWrapper<>();
- setEntityQueryWrapper.eq("user_id",userId);
- long userAssCount = assessmentSetService.count(setEntityQueryWrapper);
+ QueryWrapper<AssessmentSetAssessorEntity> assessmentSetAssessorEntityQueryWrapper = new QueryWrapper<>();
+ assessmentSetAssessorEntityQueryWrapper.eq("assessment_set_id",po.getId());
+ long userAssCount = assessmentSetAssessorService.count(assessmentSetAssessorEntityQueryWrapper);
+
if (userAssCount > 0) {
-
- map.put("assessmentTaskVO", po);
-
- //已经考核数量 获取得分
+// 已经考核数量 获取得分
QueryWrapper<AssessmentScoreEntity> scoreEntityQueryWrapper = new QueryWrapper<>();
scoreEntityQueryWrapper.eq("be_id",userId);
scoreEntityQueryWrapper.eq("type", 0l);
- scoreEntityQueryWrapper.eq("assessment_task_id",po.getId());
+ scoreEntityQueryWrapper.eq("assessment_task_id",po.getAssessmentTaskId());
List<AssessmentScoreEntity> scoreEntityList = assessmentScoreService.list(scoreEntityQueryWrapper);
double score = 0.0;
for (AssessmentScoreEntity scoreEntity:scoreEntityList) {
@@ -137,9 +147,41 @@
retList.add(map);
}
-
}
+
return R.data(retList);
+// QueryWrapper<AssessmentTaskEntity> taskEntityQueryWrapper = new QueryWrapper<>();
+// taskEntityQueryWrapper.eq("type", 0l);
+// List<AssessmentTaskEntity> assessmentTaskEntityList = assessmentTaskService.list(taskEntityQueryWrapper);
+// List<Map<String,Object>> retList = new ArrayList<>();
+// for (AssessmentTaskEntity po:assessmentTaskEntityList) {
+// Map<String,Object> map = new HashMap<>();
+//
+// QueryWrapper<AssessmentSetAssessorEntity> setEntityQueryWrapper = new QueryWrapper<>();
+// setEntityQueryWrapper.eq("user_id",userId);
+// long userAssCount = assessmentSetAssessorService.count(setEntityQueryWrapper);
+// if (userAssCount > 0) {
+//
+// map.put("assessmentTaskVO", po);
+//
+// //已经考核数量 获取得分
+// QueryWrapper<AssessmentScoreEntity> scoreEntityQueryWrapper = new QueryWrapper<>();
+// scoreEntityQueryWrapper.eq("be_id",userId);
+// scoreEntityQueryWrapper.eq("type", 0l);
+// scoreEntityQueryWrapper.eq("assessment_task_id",po.getId());
+// List<AssessmentScoreEntity> scoreEntityList = assessmentScoreService.list(scoreEntityQueryWrapper);
+// double score = 0.0;
+// for (AssessmentScoreEntity scoreEntity:scoreEntityList) {
+// score += scoreEntity.getWeight() * scoreEntity.getScoreVal() * 0.01;
+// }
+// map.put("scoreVal", score);
+// map.put("isAssessmentOk", userAssCount == scoreEntityList.size());
+// retList.add(map);
+// }
+//
+//
+// }
+// return R.data(retList);
}
/**
--
Gitblit v1.9.3