xieb
2024-01-02 d2cf8a7f7bcf49ace058d9eec587d75c4f764a2e
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
@@ -70,6 +70,11 @@
      assessmentSetVO.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
      assessmentSetVO.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
      user = UserCache.getUser(assessmentSetVO.getToUserId()); //考核人
      assessmentSetVO.setToUserName(user.getName());
      assessmentSetVO.setToDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
      assessmentSetVO.setToPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
      return assessmentSetVO;
   }
@@ -90,7 +95,7 @@
         QueryWrapper<AssessmentTaskEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("type", 0);
         wrapper.gt("end_time", LocalDateTime.now());
         wrapper.gt("is_assessment_ok", 0);
         wrapper.eq("is_assessment_ok", 0);
         List<AssessmentTaskEntity> assessmentTaskEntityList =  assessmentTaskService.list(wrapper);
         if (assessmentTaskEntityList.size() > 0)
            vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskEntityList.get(0)));
@@ -98,15 +103,19 @@
            vo.setAssessmentTaskVO(null);
         QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
         setEntityQueryWrapper.eq("score_user_id", vo.getToUserId()); //考核人id
         setEntityQueryWrapper.eq("be_id", vo.getUserId()); //被考核人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.getUserId()); //被考核人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<AssessmentSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
      pageVo.setRecords(records);