1

xieb

2024-01-15 1dca355eb004bf15df3ef88bc7d290e98e5f6e05

 src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java

@@ -24,8 +24,11 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.evaluate.dto.EvaluateTaskDTO;
import org.springblade.modules.evaluate.entity.EvaluateCandidateResultEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
import org.springblade.modules.evaluate.service.IEvaluateCandidateResultService;
import org.springblade.modules.evaluate.service.IEvaluateTaskCategoryService;
import org.springblade.modules.evaluate.service.IEvaluateTaskReferrerService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;

@@ -42,8 +45,14 @@

   private static final IEvaluateTaskReferrerService evaluateTaskReferrerService;

   private static final IEvaluateTaskCategoryService evaluateTaskCategoryService;

   private static final IEvaluateCandidateResultService evaluateCandidateResultService;

   static {
      evaluateTaskReferrerService = SpringUtil.getBean(IEvaluateTaskReferrerService.class);
      evaluateTaskCategoryService = SpringUtil.getBean(IEvaluateTaskCategoryService.class);
      evaluateCandidateResultService = SpringUtil.getBean(IEvaluateCandidateResultService.class);
   }

   public static EvaluateTaskWrapper build() {
@@ -98,16 +107,18 @@
   public IPage<EvaluateTaskVO> h5CandidatePageVO(IPage<EvaluateTaskEntity> pages) {
      List<EvaluateTaskVO> records = listVO(pages.getRecords());

//      for (EvaluateTaskVO vo: records) {
//         QueryWrapper queryWrapper = new QueryWrapper();
//         queryWrapper.eq("create_user", AuthUtil.getUserId());
//         queryWrapper.eq("evaluate_task_id", vo.getId());
//         List<EvaluateTaskReferrerEntity> evaluateTaskReferrerEntities = evaluateTaskReferrerService.list(queryWrapper);
//
//         vo.setIsVote(evaluateTaskReferrerEntities.size() > 0);
//         if (vo.getIsVote())
//            vo.setEvaluateTaskReferrerVOS(EvaluateTaskReferrerWrapper.build().listVO(evaluateTaskReferrerEntities));
//      }
      for (EvaluateTaskVO vo: records) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("create_user", AuthUtil.getUserId());
         queryWrapper.eq("evaluate_task_id", vo.getId());
         List<EvaluateCandidateResultEntity> entities = evaluateCandidateResultService.list(queryWrapper);


         vo.setIsVote(entities.size() > 0);
         if (entities.size() > 0)
            vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));

      }

      IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
      pageVo.setRecords(records);