支持多部门

xieb

2024-01-15 d17502e1ce534ac7c6645d22facbfc0e5f74ae45

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

@@ -28,6 +28,7 @@
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;

@@ -44,10 +45,13 @@

   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);
   }

@@ -109,9 +113,27 @@
         queryWrapper.eq("evaluate_task_id", vo.getId());
         List<EvaluateCandidateResultEntity> entities = evaluateCandidateResultService.list(queryWrapper);


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

//         QueryWrapper qw = new QueryWrapper();
//         qw.eq("evaluate_task_id", vo.getId());
//         List<EvaluateTaskCategoryEntity> evaluateTaskCategoryEntities = evaluateTaskCategoryService.list(qw);
//         int evaluateCount = evaluateTaskCategoryEntities.stream().mapToInt(EvaluateTaskCategoryEntity::getPeopleNum).sum(); // 计算总数
//
//         if (vo.getType() == 0) {
//            vo.setIsVote(entities.size() == evaluateCount);
//            if (entities.size() > 0)
//               vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));
//         } else {
//            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());