From beee6d33738ade682c5013dae79c1ea73ca2b61f Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 08 Jan 2024 14:23:06 +0800
Subject: [PATCH] 根据登录员工类型获取任务列表
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 15 ++++++++++++++-
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java | 30 +++++++++++++++++++++++++++++-
2 files changed, 43 insertions(+), 2 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 72edb91..e43dfd1 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
@@ -98,7 +99,19 @@
@ApiOperation(value = "分页", notes = "传入evaluateTask")
public R<IPage<EvaluateTaskVO>> selfList(EvaluateTaskEntity evaluateTask, Query query) {
IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(evaluateTask));
- return R.data(EvaluateTaskWrapper.build().h5PageVO(pages));
+ return R.data(EvaluateTaskWrapper.build().h5ReferremPageVO(pages));
+ }
+ @GetMapping("/taskListByPolling")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入evaluateTask")
+ public R<IPage<EvaluateTaskVO>> taskListByPolling(EvaluateTaskEntity evaluateTask, Query query) {
+ QueryWrapper queryWrapper = new QueryWrapper();
+ if (null != evaluateTask.getType())
+ queryWrapper.eq("", evaluateTask.getType());
+ 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));
}
/**
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 99d5d0e..0c3ee89 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
@@ -67,7 +67,12 @@
return dto;
}
- public IPage<EvaluateTaskVO> h5PageVO(IPage<EvaluateTaskEntity> pages) {
+ /**
+ * h5返回自己第一轮投票的人
+ * @param pages
+ * @return
+ */
+ public IPage<EvaluateTaskVO> h5ReferremPageVO(IPage<EvaluateTaskEntity> pages) {
List<EvaluateTaskVO> records = listVO(pages.getRecords());
for (EvaluateTaskVO vo: records) {
@@ -86,5 +91,28 @@
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<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;
+ }
+
}
--
Gitblit v1.9.3