From 2ab77e0b8957147f4937a055c55393acc793e79e Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 09 Jan 2024 10:37:30 +0800
Subject: [PATCH] 公司评优、部门评优
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 2 +-
src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java | 2 ++
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java | 25 +++++++++++++++----------
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
index 71a5876..8910c53 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -112,7 +112,7 @@
User user = userService.getById(AuthUtil.getUser().getUserId());
queryWrapper.like("polling_persons" , user.getEmployeeType());
IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), queryWrapper);
- return R.data(EvaluateTaskWrapper.build().pageVO(pages));
+ return R.data(EvaluateTaskWrapper.build().h5CandidatePageVO(pages));
}
/**
diff --git a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java
index d3598ac..4927033 100644
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java
+++ b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java
@@ -37,4 +37,6 @@
private List<EvaluateTaskReferrerVO> evaluateTaskReferrerVOS; //投票详情
+ private List<EvaluateCandidateResultVO> evaluateCandidateResultVOS;//公司投票结果和部门投票结果
+
}
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..7bf84ed 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,10 @@
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.EvaluateTaskEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
+import org.springblade.modules.evaluate.service.IEvaluateCandidateResultService;
import org.springblade.modules.evaluate.service.IEvaluateTaskReferrerService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
@@ -42,8 +44,11 @@
private static final IEvaluateTaskReferrerService evaluateTaskReferrerService;
+ private static final IEvaluateCandidateResultService evaluateCandidateResultService;
+
static {
evaluateTaskReferrerService = SpringUtil.getBean(IEvaluateTaskReferrerService.class);
+ evaluateCandidateResultService = SpringUtil.getBean(IEvaluateCandidateResultService.class);
}
public static EvaluateTaskWrapper build() {
@@ -98,16 +103,16 @@
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);
+
+ vo.setIsVote(entities.size() > 0);
+ if (vo.getIsVote())
+ vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));
+ }
IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
pageVo.setRecords(records);
--
Gitblit v1.9.3