From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
index 9c1c0fe..5e53bd4 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
@@ -16,11 +16,18 @@
*/
package org.springblade.modules.evaluate.wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.common.cache.SysCache;
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.EvaluateTaskReferrerEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
-import java.util.Objects;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
+
+import java.util.*;
/**
* 评优任务推荐人员表 包装类,返回视图层所需的字段
@@ -29,6 +36,12 @@
* @since 2024-01-05
*/
public class EvaluateTaskReferrerWrapper extends BaseEntityWrapper<EvaluateTaskReferrerEntity, EvaluateTaskReferrerVO> {
+
+ private static final IUserService userService;
+
+ static {
+ userService = SpringUtil.getBean(IUserService.class);
+ }
public static EvaluateTaskReferrerWrapper build() {
return new EvaluateTaskReferrerWrapper();
@@ -46,5 +59,25 @@
return evaluateTaskReferrerVO;
}
+ public Object listInfoVO(IPage<EvaluateTaskReferrerEntity> pages) {
+ List<EvaluateTaskReferrerEntity> list = pages.getRecords();
+ List<Map<String,Object>> maps = new ArrayList<>();
+ for (EvaluateTaskReferrerEntity po:list) {
+ Map<String,Object> map = new HashMap<>();
+ User user = userService.getById(po.getCreateUser());//投票人
+ if (null != user) {
+ map.put("userName", user.getName());
+ map.put("deptName", SysCache.getDeptNames(user.getDeptId()));
+ map.put("postName", SysCache.getPostNames(user.getPostId()));
+ map.put("remark", po.getRemark());//投票理由
+ maps.add(map);
+ }
+ }
+
+ IPage<Map<String,Object>> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
+ pageVo.setRecords(maps);
+ return pageVo;
+ }
+
}
--
Gitblit v1.9.3