From d662e2b0d1d7cf5ce80565ffb361a1158ee635eb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 05 Jan 2024 17:49:45 +0800
Subject: [PATCH] 新增H5任务列表
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 14 ++++++++++++++
src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java | 6 ++++++
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 0 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 c1eff80..72edb91 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -88,6 +88,20 @@
}
/**
+ * H5使用-评优任务列表
+ * @param evaluateTask
+ * @param query
+ * @return 返回自己是否投票和投票集合
+ */
+ @GetMapping("/selfList")
+ @ApiOperationSupport(order = 2)
+ @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));
+ }
+
+ /**
* 根据部门id获取用户列表
* @param query 分页
* @param user 用户参数
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 d2a3661..d3598ac 100644
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java
+++ b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskVO.java
@@ -20,6 +20,8 @@
import lombok.EqualsAndHashCode;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
+import java.util.List;
+
/**
* 评优任务表 视图实体类
*
@@ -31,4 +33,8 @@
public class EvaluateTaskVO extends EvaluateTaskEntity {
private static final long serialVersionUID = 1L;
+ private Boolean isVote;//是否投票
+
+ private List<EvaluateTaskReferrerVO> evaluateTaskReferrerVOS; //投票详情
+
}
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 f5612b4..99d5d0e 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
@@ -16,11 +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.secure.utils.AuthUtil;
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.EvaluateTaskEntity;
+import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
+import org.springblade.modules.evaluate.service.IEvaluateTaskReferrerService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
+
+import java.util.List;
import java.util.Objects;
/**
@@ -30,6 +39,12 @@
* @since 2024-01-05
*/
public class EvaluateTaskWrapper extends BaseEntityWrapper<EvaluateTaskEntity, EvaluateTaskVO> {
+
+ private static final IEvaluateTaskReferrerService evaluateTaskReferrerService;
+
+ static {
+ evaluateTaskReferrerService = SpringUtil.getBean(IEvaluateTaskReferrerService.class);
+ }
public static EvaluateTaskWrapper build() {
return new EvaluateTaskWrapper();
@@ -52,5 +67,24 @@
return dto;
}
+ public IPage<EvaluateTaskVO> h5PageVO(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