From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 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 2049468..eb6804a 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
@@ -16,10 +16,22 @@
*/
package org.springblade.modules.assessment.wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
+import org.springblade.modules.assessment.service.IAssessmentTaskService;
+import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
+import org.springblade.modules.assessment.vo.AssessmentSetVO;
+
+import java.util.List;
import java.util.Objects;
/**
@@ -29,6 +41,18 @@
* @since 2024-01-02
*/
public class AssessmentSetAssessorWrapper extends BaseEntityWrapper<AssessmentSetAssessorEntity, AssessmentSetAssessorVO> {
+
+ private static final IAssessmentSetService assessmentSetService;
+
+ private static final IAssessmentTaskService assessmentTaskService;
+
+ private static final IAssessmentScoreService assessmentScoreService;
+
+ static {
+ assessmentSetService = SpringUtil.getBean(IAssessmentSetService.class);
+ assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
+ assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
+ }
public static AssessmentSetAssessorWrapper build() {
return new AssessmentSetAssessorWrapper();
@@ -47,4 +71,39 @@
}
+ public IPage<AssessmentSetAssessorVO> h5PageVO(IPage<AssessmentSetAssessorEntity> pages, Long userId) {
+ List<AssessmentSetAssessorVO> records = listVO(pages.getRecords());
+
+ for (AssessmentSetAssessorVO vo : records) {
+ AssessmentSetVO assessmentSetVO = AssessmentSetWrapper.build().entityVO(assessmentSetService.getById(vo.getAssessmentSetId()));
+ vo.setAssessmentSetVO(assessmentSetVO);//被考核人
+ vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskService.getById(assessmentSetVO.getAssessmentTaskId())));//考核人
+
+ //是否评论完成
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("type", vo.getAssessmentTaskVO().getType());//任务状态是个人还是部门 0：个人1：部门 自己是否评论完成，根据type获取对应的考核结果数量。
+ queryWrapper.eq("score_user_id", userId);// 考核人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) {
+ AssessmentScoreVO assessmentScoreVO = AssessmentScoreWrapper.build().entityVO(assessmentScoreService.getOne(queryWrapper));
+
+ vo.setIsAssessmentOk(null != assessmentScoreVO);
+ vo.setAssessmentScoreVO(assessmentScoreVO);
+ } else {
+ vo.setIsAssessmentOk(false);
+ }
+
+ }
+
+ IPage<AssessmentSetAssessorVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
+ pageVo.setRecords(records);
+ return pageVo;
+ }
}
--
Gitblit v1.9.3