From 63a4dd5239676ff135d05bfa31362a3fb36af3c1 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 14 Dec 2023 16:03:57 +0800
Subject: [PATCH] 我的评分列表
---
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 1 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 108d4bd..03052c7 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,11 @@
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.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;
@@ -41,6 +46,9 @@
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Map;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -53,11 +61,15 @@
*/
@RestController
@AllArgsConstructor
-@RequestMapping("assessmentScore/assessmentScore")
+@RequestMapping("assessment/assessmentScore")
@Api(value = "考核评分", tags = "考核评分接口")
public class AssessmentScoreController extends BladeController {
private final IAssessmentScoreService assessmentScoreService;
+
+ private final IAssessmentTaskService assessmentTaskService;
+
+ private final IAssessmentSetService assessmentSetService;
/**
* 考核评分 详情
@@ -80,6 +92,57 @@
return R.data(AssessmentScoreWrapper.build().pageVO(pages));
}
+ @GetMapping("/listGroupByTask/{scoreUserId}")
+ @ApiOperation(value = "我的得分列表", notes = "传入要查询的用户id")
+ public R listGroupByTask(@ApiIgnore @PathVariable Long scoreUserId) {
+ 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);
+
+ return R.data(voList);
+ }
+
+ @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);
+ List<Map<String,Object>> retList = new ArrayList<>();
+ for (AssessmentTaskEntity po:assessmentTaskEntityList) {
+ Map<String,Object> map = new HashMap<>();
+
+ QueryWrapper<AssessmentSetEntity> setEntityQueryWrapper = new QueryWrapper<>();
+ setEntityQueryWrapper.eq("user_id",userId);
+ long userAssCount = assessmentSetService.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