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/assessment/wrapper/AssessmentSetWrapper.java | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
index 3c54871..b312626 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
@@ -16,19 +16,15 @@
*/
package org.springblade.modules.assessment.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.common.cache.UserCache;
+
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.assessment.entity.AssessmentSetEntity;
+import org.springblade.modules.assessment.service.IAssessmentScoreService;
+import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentSetVO;
-import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
import java.util.Objects;
/**
@@ -39,8 +35,13 @@
*/
public class AssessmentSetWrapper extends BaseEntityWrapper<AssessmentSetEntity, AssessmentSetVO> {
- @Autowired
- private IUserService userService;
+ private static final IAssessmentTaskService assessmentTaskService;
+ private static final IAssessmentScoreService assessmentScoreService;
+
+ static {
+ assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
+ assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
+ }
public static AssessmentSetWrapper build() {
return new AssessmentSetWrapper();
@@ -57,20 +58,5 @@
return assessmentSetVO;
}
-
- @Override
- public IPage<AssessmentSetVO> pageVO(IPage<AssessmentSetEntity> pages) {
- List<AssessmentSetVO> records = listVO(pages.getRecords());
- for (AssessmentSetVO vo:records) {
- User user = UserCache.getUser(vo.getToUserId());
- vo.setUserName(user.getName());
- vo.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
- vo.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
- }
- IPage<AssessmentSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
- pageVo.setRecords(records);
- return pageVo;
- }
-
}
--
Gitblit v1.9.3