From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复

---
 src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java |   84 +++++++++++++++++++++++++++++++++++------
 1 files changed, 71 insertions(+), 13 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 3bccbb3..9040d26 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
@@ -20,31 +20,39 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.SpringUtil;
-import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
+import org.springblade.modules.evaluate.dto.EvaluateTaskDTO;
+import org.springblade.modules.evaluate.entity.EvaluateCandidateResultEntity;
 import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
-import org.springblade.modules.evaluate.service.IEvaluateResultService;
+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;
 
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 评优任务表 包装类,返回视图层所需的字段
  *
  * @author aix
- * @since 2023-12-08
+ * @since 2024-01-05
  */
 public class EvaluateTaskWrapper extends BaseEntityWrapper<EvaluateTaskEntity, EvaluateTaskVO>  {
 
-	private static final IEvaluateCandidateService evaluateCandidateService;
-	private static final IEvaluateResultService evaluateResultService;
+	private static final IEvaluateTaskReferrerService evaluateTaskReferrerService;
+
+	private static final IEvaluateTaskCategoryService evaluateTaskCategoryService;
+
+	private static final IEvaluateCandidateResultService evaluateCandidateResultService;
 
 	static {
-		evaluateCandidateService = SpringUtil.getBean(IEvaluateCandidateService.class);
-		evaluateResultService = SpringUtil.getBean(IEvaluateResultService.class);
+		evaluateTaskReferrerService = SpringUtil.getBean(IEvaluateTaskReferrerService.class);
+		evaluateTaskCategoryService = SpringUtil.getBean(IEvaluateTaskCategoryService.class);
+		evaluateCandidateResultService = SpringUtil.getBean(IEvaluateCandidateResultService.class);
 	}
 
 	public static EvaluateTaskWrapper build() {
@@ -63,9 +71,59 @@
 		return evaluateTaskVO;
 	}
 
-	public EvaluateTaskEntity entityPO(EvaluateTaskVO vo) {
-		EvaluateTaskEntity po = Objects.requireNonNull(BeanUtil.copy(vo, EvaluateTaskEntity.class));
-		return po;
+	public EvaluateTaskDTO entityDTO(EvaluateTaskEntity evaluateTask) {
+		EvaluateTaskDTO dto = Objects.requireNonNull(BeanUtil.copy(evaluateTask, EvaluateTaskDTO.class));
+		return dto;
 	}
 
+	/**
+	 * h5返回自己第一轮投票的人
+	 * @param pages
+	 * @return
+	 */
+	public IPage<EvaluateTaskVO> h5ReferremPageVO(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));
+		}
+
+		IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
+		pageVo.setRecords(records);
+		return pageVo;
+	}
+
+	/**
+	 * 第二轮候选人投票
+	 * @return
+	 */
+	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<EvaluateCandidateResultEntity> entities = evaluateCandidateResultService.list(queryWrapper);
+
+
+			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);
+		return pageVo;
+	}
+
+
 }

--
Gitblit v1.9.3