修复

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

/**
@@ -45,9 +36,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() {
@@ -65,29 +58,5 @@

      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.gt("end_time", LocalDateTime.now());
         vo.setAssessmentTaskVO(AssessmentTaskWrapper.build().entityVO(assessmentTaskService.list(wrapper).get(0)));
      }
      IPage<AssessmentSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
      pageVo.setRecords(records);
      return pageVo;
   }


}