From 18bbf2f8fb8ea99b03e81b78391afedc6f2b69d9 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 11:21:03 +0800
Subject: [PATCH] 返回投票理由
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 0c3ee89..47ebf90 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
@@ -24,8 +24,12 @@
import org.springblade.core.tool.utils.BeanUtil;
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;
@@ -42,8 +46,14 @@
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);
}
public static EvaluateTaskWrapper build() {
@@ -98,16 +108,30 @@
public IPage<EvaluateTaskVO> h5CandidatePageVO(IPage<EvaluateTaskEntity> pages) {
List<EvaluateTaskVO> records = listVO(pages.getRecords());
-// for (EvaluateTaskVO vo: records) {
-// QueryWrapper queryWrapper = new QueryWrapper();
-// queryWrapper.eq("create_user", AuthUtil.getUserId());
-// queryWrapper.eq("evaluate_task_id", vo.getId());
-// List<EvaluateTaskReferrerEntity> evaluateTaskReferrerEntities = evaluateTaskReferrerService.list(queryWrapper);
-//
-// vo.setIsVote(evaluateTaskReferrerEntities.size() > 0);
-// if (vo.getIsVote())
-// vo.setEvaluateTaskReferrerVOS(EvaluateTaskReferrerWrapper.build().listVO(evaluateTaskReferrerEntities));
-// }
+ for (EvaluateTaskVO vo: records) {
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("create_user", AuthUtil.getUserId());
+ queryWrapper.eq("evaluate_task_id", vo.getId());
+ 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(); // 计算总数
+
+ 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());
pageVo.setRecords(records);
--
Gitblit v1.9.3