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/wrapper/EvaluateTaskWrapper.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
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 be7afc6..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,29 +16,35 @@
*/
package org.springblade.modules.evaluate.wrapper;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.reflect.TypeToken;
import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.assessment.wrapper.CandidateJsonObj;
+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.Map;
import java.util.Objects;
/**
* 评优任务表 包装类,返回视图层所需的字段
*
* @author aix
- * @since 2023-12-08
+ * @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();
@@ -56,5 +62,29 @@
return evaluateTaskVO;
}
+ public EvaluateTaskDTO entityDTO(EvaluateTaskEntity evaluateTask) {
+ EvaluateTaskDTO dto = Objects.requireNonNull(BeanUtil.copy(evaluateTask, EvaluateTaskDTO.class));
+ 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