From 5010d9601e510fb3b70bb9ca3a55ad2552b2ae16 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 02 Jan 2024 10:02:18 +0800
Subject: [PATCH] h5评优任务返回自己是否评论完成
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java
index cd69335..8a8242a 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java
@@ -25,9 +25,11 @@
import org.springblade.modules.evaluate.entity.EvaluateCandidateAssessorEntity;
import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
+import org.springblade.modules.evaluate.service.IEvaluateResultService;
import org.springblade.modules.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;
import org.springblade.modules.evaluate.vo.EvaluateCandidateVO;
+import org.springblade.modules.evaluate.vo.EvaluateResultVO;
import java.util.List;
import java.util.Objects;
@@ -43,9 +45,12 @@
private static final IEvaluateCandidateService evaluateCandidateService;
private static final IEvaluateTaskService evaluateTaskService;
+ private static final IEvaluateResultService evaluateResultService;
+
static {
evaluateCandidateService = SpringUtil.getBean(IEvaluateCandidateService.class);
evaluateTaskService = SpringUtil.getBean(IEvaluateTaskService.class);
+ evaluateResultService = SpringUtil.getBean(IEvaluateResultService.class);
}
public static EvaluateCandidateAssessorWrapper build() {
return new EvaluateCandidateAssessorWrapper();
@@ -64,13 +69,46 @@
}
public IPage<EvaluateCandidateAssessorVO> h5PageVO(IPage<EvaluateCandidateAssessorEntity> pages, Long userId) {
- System.out.println(userId);
List<EvaluateCandidateAssessorVO> records = listVO(pages.getRecords());
for (EvaluateCandidateAssessorVO vo : records) {
EvaluateCandidateVO candidateVO = EvaluateCandidateWrapper.build().entityVO(evaluateCandidateService.getById(vo.getEvaluateCandidateId()));
vo.setEvaluateCandidateVO(candidateVO);
vo.setEvaluateTaskVO(EvaluateTaskWrapper.build().entityVO(evaluateTaskService.getById(candidateVO.getEvaluateTaskId())));
+
+ // 任务状态是个人还是部门
+ if (vo.getEvaluateTaskVO().getType() == 0) {
+ //是否评论完成
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("type", 0);
+ queryWrapper.eq("score_user_id", userId);
+ queryWrapper.eq("evaluate_task_id", vo.getEvaluateTaskVO().getId());// 任务id
+ EvaluateResultVO resultVO = EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(queryWrapper));
+
+ vo.setIsEvaluateOneOk(null != resultVO);
+ vo.setEvaluateResultOneVO(resultVO);
+
+ queryWrapper.eq("type", 2);
+ queryWrapper.eq("score_user_id", userId);
+ queryWrapper.eq("evaluate_task_id", vo.getEvaluateTaskVO().getId());// 任务id
+ resultVO = EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(queryWrapper));
+
+ vo.setIsEvaluateTwoOk(null != resultVO);
+ vo.setEvaluateResultTwoVO(resultVO);
+
+ } else {// 部门
+ //是否评论完成
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("type", 1);
+ queryWrapper.eq("score_user_id", userId);
+ queryWrapper.eq("evaluate_task_id", vo.getEvaluateTaskVO().getId());// 任务id
+ EvaluateResultVO resultVO = EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(queryWrapper));
+
+ vo.setIsEvaluateOneOk(null != resultVO);
+ vo.setEvaluateResultOneVO(resultVO);
+
+ }
+
}
IPage<EvaluateCandidateAssessorVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
--
Gitblit v1.9.3