From d2cf8a7f7bcf49ace058d9eec587d75c4f764a2e Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 02 Jan 2024 11:56:13 +0800
Subject: [PATCH] 考核任务设置被考核人
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
index 1b4eb08..9d392ac 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -32,10 +32,13 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.assessment.wrapper.CandidateJsonObj;
+import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.excel.EvaluateTaskExcel;
+import org.springblade.modules.evaluate.service.IEvaluateResultService;
import org.springblade.modules.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
+import org.springblade.modules.evaluate.wrapper.EvaluateResultWrapper;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
@@ -68,6 +71,8 @@
private final IEvaluateTaskService evaluateTaskService;
private final IUserService userService;
+ private final IEvaluateResultService evaluateResultService;
+
/**
* 评优任务表 详情
*/
@@ -89,6 +94,13 @@
return R.data(EvaluateTaskWrapper.build().pageVO(pages));
}
+
+ /**
+ * 个人评优
+ * @param userId
+ * @param query
+ * @return
+ */
@GetMapping("/taskList/{deptId}/{userId}")
public R taskList(@ApiIgnore @PathVariable Long deptId,@ApiIgnore @PathVariable Long userId, Query query) {
QueryWrapper<EvaluateTaskEntity> wrapper = new QueryWrapper<>();
@@ -122,6 +134,29 @@
break;
}
}
+
+ //是否评论完成
+ QueryWrapper<EvaluateResultEntity> resultEntityQueryWrapper = new QueryWrapper<>();
+ resultEntityQueryWrapper.eq("score_user_id", userId);
+ resultEntityQueryWrapper.eq("type", 0);
+ resultEntityQueryWrapper.eq("evaluate_task_id", vo.getId());
+ long reqCount = evaluateResultService.count(resultEntityQueryWrapper);
+ vo.setIsEvaluateOk(reqCount > 0);
+ if (reqCount > 0) {
+ vo.setEvaluateResultVO(EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(resultEntityQueryWrapper)));
+ }
+
+ } else {
+ //是否评论完成
+ QueryWrapper<EvaluateResultEntity> resultEntityQueryWrapper = new QueryWrapper<>();
+ resultEntityQueryWrapper.eq("score_user_id", userId);
+ resultEntityQueryWrapper.eq("type", 1);
+ resultEntityQueryWrapper.eq("evaluate_task_id", vo.getId());
+ long reqCount = evaluateResultService.count(resultEntityQueryWrapper);
+ vo.setIsEvaluateOk(reqCount > 0);
+ if (reqCount > 0) {
+ vo.setEvaluateResultVO(EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(resultEntityQueryWrapper)));
+ }
}
}
@@ -148,8 +183,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入evaluateTask")
- public R save(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
- return R.status(evaluateTaskService.save(evaluateTask));
+ public R save(@Valid @RequestBody EvaluateTaskVO vo) {
+ return R.status(evaluateTaskService.save(vo));
}
/**
@@ -158,8 +193,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入evaluateTask")
- public R update(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
- return R.status(evaluateTaskService.updateById(evaluateTask));
+ public R update(@Valid @RequestBody EvaluateTaskVO vo) {
+ return R.status(evaluateTaskService.updateById(vo));
}
/**
--
Gitblit v1.9.3