From d17502e1ce534ac7c6645d22facbfc0e5f74ae45 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 15 Jan 2024 15:03:56 +0800
Subject: [PATCH] 支持多部门
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 89e1e59..bf1e270 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
+++ b/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,15 +114,26 @@
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() == evaluateCount);
+ 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));
+// }
+
+
}
IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
--
Gitblit v1.9.3