修复

xieb

2025-01-21 bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21

 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;
@@ -29,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;
@@ -77,18 +76,30 @@

      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())));
         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);
         queryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());// 任务id
         AssessmentScoreVO assessmentScoreVO = AssessmentScoreWrapper.build().entityVO(assessmentScoreService.getOne(queryWrapper));
         queryWrapper.eq("score_user_id", userId);// 考核人id

         vo.setIsAssessmentOk(null != assessmentScoreVO);
         vo.setAssessmentScoreVO(assessmentScoreVO);
         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());