修复

xieb

2025-01-21 bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21

 src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java

@@ -16,24 +16,15 @@
 */
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.common.cache.SysCache;
import org.springblade.common.cache.UserCache;

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 java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;

/**
@@ -65,53 +56,7 @@
      //assessmentSetVO.setCreateUserName(createUser.getName());
      //assessmentSetVO.setUpdateUserName(updateUser.getName());

      User user = UserCache.getUser(assessmentSetVO.getUserId()); //被考核人
      assessmentSetVO.setUserName(user.getName());
      assessmentSetVO.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
      assessmentSetVO.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));

      return assessmentSetVO;
   }

   @Override
   public IPage<AssessmentSetVO> pageVO(IPage<AssessmentSetEntity> pages) {
      List<AssessmentSetVO> records = listVO(pages.getRecords());
      for (AssessmentSetVO vo:records) {
         User user = UserCache.getUser(vo.getUserId()); //被考核人
         vo.setUserName(user.getName());
         vo.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
         vo.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));

         user = UserCache.getUser(vo.getToUserId()); //考核人
         vo.setToUserName(user.getName());
         vo.setToDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
         vo.setToPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));

         QueryWrapper<AssessmentTaskEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("type", 0);
         wrapper.gt("end_time", LocalDateTime.now());
         wrapper.gt("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);
      return pageVo;
   }


}