被考核人投票结果按名称、部门名称过滤

xieb

2024-01-10 6ea32ff395a036ff266da2de46e7ea174409581b

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

@@ -25,9 +25,11 @@
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.EvaluateTaskCategoryEntity;
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 +46,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 +114,23 @@
         queryWrapper.eq("evaluate_task_id", vo.getId());
         List<EvaluateCandidateResultEntity> entities = evaluateCandidateResultService.list(queryWrapper);

         vo.setIsVote(entities.size() > 0);
         if (vo.getIsVote())
            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());