xieb
2023-12-18 3d88793efc19e5c8dc4700edff4ccbbbec9dbd01
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
@@ -24,13 +24,13 @@
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.AssessmentSetEntity;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
import org.springblade.modules.assessment.service.IAssessmentScoreService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import java.time.LocalDateTime;
import java.util.List;
@@ -45,9 +45,11 @@
public class AssessmentSetWrapper extends BaseEntityWrapper<AssessmentSetEntity, AssessmentSetVO>  {
   private static final IAssessmentTaskService assessmentTaskService;
   private static final IAssessmentScoreService assessmentScoreService;
   static {
      assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
      assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
   }
   public static AssessmentSetWrapper build() {
@@ -86,8 +88,25 @@
         vo.setToPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
         QueryWrapper<AssessmentTaskEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("type", 0);
         wrapper.gt("end_time", LocalDateTime.now());
         vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskService.list(wrapper).get(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)));
         else
            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);
      }
      IPage<AssessmentSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
      pageVo.setRecords(records);