From a4baf57cb433dfcee1c58a7d9d3f96f34ffbd697 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 11:31:52 +0800
Subject: [PATCH] 用户手机号码查询
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
index 7bf84ed..47ebf90 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
+++ b/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());
--
Gitblit v1.9.3