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/wrapper/AssessmentSetAssessorWrapper.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 ea2ccf8..6b987dd 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
@@ -22,6 +22,7 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
import org.springblade.modules.assessment.service.IAssessmentScoreService;
import org.springblade.modules.assessment.service.IAssessmentSetService;
@@ -83,12 +84,19 @@
//是否评论完成
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("type", vo.getAssessmentTaskVO().getType());//任务状态是个人还是部门 0：个人1：部门 自己是否评论完成，根据type获取对应的考核结果数量。
- queryWrapper.eq("score_user_id", userId);
+ queryWrapper.eq("score_user_id", userId);// 考核人id
+ queryWrapper.eq("be_id", assessmentSetVO.getUserId());// 被考核人id
queryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());// 任务id
- AssessmentScoreVO assessmentScoreVO = AssessmentScoreWrapper.build().entityVO(assessmentScoreService.getOne(queryWrapper));
+ AssessmentScoreEntity entity = assessmentScoreService.getOne(queryWrapper);
+ if (null != entity) {
+ AssessmentScoreVO assessmentScoreVO = AssessmentScoreWrapper.build().entityVO(assessmentScoreService.getOne(queryWrapper));
- vo.setIsAssessmentOk(null != assessmentScoreVO);
- vo.setAssessmentScoreVO(assessmentScoreVO);
+ vo.setIsAssessmentOk(null != assessmentScoreVO);
+ vo.setAssessmentScoreVO(assessmentScoreVO);
+ } else {
+ vo.setIsAssessmentOk(false);
+ }
+
}
IPage<AssessmentSetAssessorVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
--
Gitblit v1.9.3