1

xieb

2024-01-12 a65b8d25e47247e2fe66edc9ab73563631770850

1

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

@@ -25,7 +25,6 @@
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;
@@ -115,20 +114,24 @@
            List<EvaluateCandidateResultEntity> entities = evaluateCandidateResultService.list(queryWrapper);


            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(); // 计算总数
            vo.setIsVote(entities.size() > 0);
            if (entities.size() > 0)
                vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));

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


        }