From a8e4e63745dd53ff923e5704c06676f296e9e1ab Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 29 Dec 2023 17:16:27 +0800
Subject: [PATCH] h5根据登录用户获取评优任务
---
src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java | 3 +++
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateCandidateAssessorWrapper.java | 32 ++++++++++++++++++++++++++++++++
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java | 8 ++++++++
3 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java
index e6b6620..5b4ab6c 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateAssessorController.java
@@ -80,6 +80,14 @@
return R.data(EvaluateCandidateAssessorWrapper.build().pageVO(pages));
}
+ @GetMapping("/listByAssessor")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "h5任务列表-分页", notes = "传入evaluateCandidateAssessor")
+ public R<IPage<EvaluateCandidateAssessorVO>> listByAssessor(@ApiIgnore @RequestParam Map<String, Object> evaluateCandidateAssessor, Query query) {;
+ IPage<EvaluateCandidateAssessorEntity> pages = evaluateCandidateAssessorService.page(Condition.getPage(query), Condition.getQueryWrapper(evaluateCandidateAssessor, EvaluateCandidateAssessorEntity.class));
+ return R.data(EvaluateCandidateAssessorWrapper.build().h5PageVO(pages, Long.valueOf(evaluateCandidateAssessor.get("userId").toString())));
+ }
+
/**
* 候选人评定表 自定义分页
*/
diff --git a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java
index 3d7bb94..a055d5c 100644
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java
+++ b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateAssessorVO.java
@@ -32,4 +32,7 @@
public class EvaluateCandidateAssessorVO extends EvaluateCandidateAssessorEntity {
private static final long serialVersionUID = 1L;
+ private EvaluateCandidateVO evaluateCandidateVO;
+ private EvaluateTaskVO evaluateTaskVO;
+
}
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..cd69335 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,20 @@
*/
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.IEvaluateTaskService;
import org.springblade.modules.evaluate.vo.EvaluateCandidateAssessorVO;
+import org.springblade.modules.evaluate.vo.EvaluateCandidateVO;
+
+import java.util.List;
import java.util.Objects;
/**
@@ -30,6 +40,13 @@
*/
public class EvaluateCandidateAssessorWrapper extends BaseEntityWrapper<EvaluateCandidateAssessorEntity, EvaluateCandidateAssessorVO> {
+ private static final IEvaluateCandidateService evaluateCandidateService;
+ private static final IEvaluateTaskService evaluateTaskService;
+
+ static {
+ evaluateCandidateService = SpringUtil.getBean(IEvaluateCandidateService.class);
+ evaluateTaskService = SpringUtil.getBean(IEvaluateTaskService.class);
+ }
public static EvaluateCandidateAssessorWrapper build() {
return new EvaluateCandidateAssessorWrapper();
}
@@ -46,5 +63,20 @@
return evaluateCandidateAssessorVO;
}
+ 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())));
+ }
+
+ IPage<EvaluateCandidateAssessorVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
+ pageVo.setRecords(records);
+ return pageVo;
+ }
+
}
--
Gitblit v1.9.3