xieb
2024-01-02 d2cf8a7f7bcf49ace058d9eec587d75c4f764a2e
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetDeptWrapper.java
@@ -94,15 +94,19 @@
         else
            vo.setAssessmentTaskVO(null);
         QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
         setEntityQueryWrapper.eq("score_user_id", vo.getToUserId()); //考核人id
         setEntityQueryWrapper.eq("be_id", vo.getDeptId()); //被考核人id
         setEntityQueryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());//考核任务
         List<AssessmentScoreEntity> assessmentScoreEntityList = assessmentScoreService.list(setEntityQueryWrapper);
         if (assessmentScoreEntityList.size() > 0)
            vo.setAssessmentScoreVO(AssessmentScoreWrapper.build().entityVO(assessmentScoreEntityList.get(0)));
         else
            vo.setAssessmentScoreVO(null);
         //拿考核成绩
         if (null != vo.getAssessmentTaskVO()) {
            QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
            setEntityQueryWrapper.eq("score_user_id", vo.getToUserId()); //考核人id
            setEntityQueryWrapper.eq("be_id", vo.getDeptId()); //被考核人id
            setEntityQueryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());//考核任务
            List<AssessmentScoreEntity> assessmentScoreEntityList = assessmentScoreService.list(setEntityQueryWrapper);
            if (assessmentScoreEntityList.size() > 0)
               vo.setAssessmentScoreVO(AssessmentScoreWrapper.build().entityVO(assessmentScoreEntityList.get(0)));
            else
               vo.setAssessmentScoreVO(null);
         }
      }
      IPage<AssessmentSetDeptVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
      pageVo.setRecords(records);