From ffaa6ca7eab630bf64f66e687f835dcd57f39f1a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 04 Jan 2024 09:04:38 +0800
Subject: [PATCH] 查询考核列表异常
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java | 70 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 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 3f9948c..8a8242a 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java
@@ -16,10 +16,22 @@
*/
package org.springblade.modules.evaluate.wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
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;
/**
@@ -30,6 +42,16 @@
*/
public class EvaluateCandidateAssessorWrapper extends BaseEntityWrapper<EvaluateCandidateAssessorEntity, EvaluateCandidateAssessorVO> {
+ 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();
}
@@ -46,5 +68,53 @@
return evaluateCandidateAssessorVO;
}
+ public IPage<EvaluateCandidateAssessorVO> h5PageVO(IPage<EvaluateCandidateAssessorEntity> pages, Long 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());
+ pageVo.setRecords(records);
+ return pageVo;
+ }
+
}
--
Gitblit v1.9.3