From 72ad65195ca3fbf25252673899d751e421dcd001 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 05 Jan 2024 09:39:23 +0800
Subject: [PATCH] 考核任务修改
---
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
index 6b987dd..0df46c9 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
@@ -30,8 +30,6 @@
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
-import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;
import java.util.List;
import java.util.Objects;
@@ -85,7 +83,12 @@
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("type", vo.getAssessmentTaskVO().getType());//任务状态是个人还是部门 0：个人1：部门 自己是否评论完成，根据type获取对应的考核结果数量。
queryWrapper.eq("score_user_id", userId);// 考核人id
- queryWrapper.eq("be_id", assessmentSetVO.getUserId());// 被考核人id
+
+ if (vo.getAssessmentTaskVO().getType() == 0)
+ queryWrapper.eq("be_id", assessmentSetVO.getUserId());// 被考核人id
+ else
+ queryWrapper.eq("be_id", assessmentSetVO.getDeptId());// 被考核部门id
+
queryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());// 任务id
AssessmentScoreEntity entity = assessmentScoreService.getOne(queryWrapper);
if (null != entity) {
--
Gitblit v1.9.3