From 5a979967f3321c87d5ba8ff7fa768cfc648ed3fc Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 05 Jan 2024 16:35:38 +0800
Subject: [PATCH] 评优任务投票推荐人
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java | 59 ++++++-----------------------------------------------------
1 files changed, 6 insertions(+), 53 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 b9ac3b2..f5612b4 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
@@ -16,36 +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.EvaluateCandidateEntity;
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
+import org.springblade.modules.evaluate.dto.EvaluateTaskDTO;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
-import org.springblade.modules.evaluate.service.IEvaluateResultService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
-
-import java.util.*;
+import java.util.Objects;
/**
* 评优任务表 包装类,返回视图层所需的字段
*
* @author aix
- * @since 2023-12-08
+ * @since 2024-01-05
*/
public class EvaluateTaskWrapper extends BaseEntityWrapper<EvaluateTaskEntity, EvaluateTaskVO> {
-
- private static final IEvaluateCandidateService evaluateCandidateService;
- private static final IEvaluateResultService evaluateResultService;
-
- static {
- evaluateCandidateService = SpringUtil.getBean(IEvaluateCandidateService.class);
- evaluateResultService = SpringUtil.getBean(IEvaluateResultService.class);
- }
public static EvaluateTaskWrapper build() {
return new EvaluateTaskWrapper();
@@ -63,40 +47,9 @@
return evaluateTaskVO;
}
- public IPage<EvaluateTaskVO> companyListPageVO(IPage pages,Long userId) {
- List<EvaluateTaskVO> records = listVO(pages.getRecords());
-
- for (EvaluateTaskVO vo:records) {
- if (vo.getEvaluateState() == 1) {
- QueryWrapper<EvaluateCandidateEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("evaluate_task_id", vo.getId());
- List<EvaluateCandidateEntity> candidateEntitieList = evaluateCandidateService.list(queryWrapper);
- List<Map<String,Object>> users = new ArrayList<>();
- for (EvaluateCandidateEntity evaluateCandidate:candidateEntitieList) {
- Map<String,Object> user = new HashMap<>();
- user.put("id",evaluateCandidate.getUserId());
- user.put("name",evaluateCandidate.getUserName());
- users.add(user);
- }
- vo.setSelfCandidate(users);
-
- //是否评论完成
- QueryWrapper<EvaluateResultEntity> resultEntityQueryWrapper = new QueryWrapper<>();
- resultEntityQueryWrapper.eq("score_user_id", userId);
- resultEntityQueryWrapper.eq("type", 2);
- resultEntityQueryWrapper.eq("evaluate_task_id", vo.getId());
- long reqCount = evaluateResultService.count(resultEntityQueryWrapper);
-
- vo.setIsEvaluateOk(reqCount > 0);
- if (reqCount > 0) {
- vo.setEvaluateResultVO(EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(resultEntityQueryWrapper)));
- }
- }
- }
-
- IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
- pageVo.setRecords(records);
- return pageVo;
+ public EvaluateTaskDTO entityDTO(EvaluateTaskEntity evaluateTask) {
+ EvaluateTaskDTO dto = Objects.requireNonNull(BeanUtil.copy(evaluateTask, EvaluateTaskDTO.class));
+ return dto;
}
--
Gitblit v1.9.3