From 3450525681e6e290d80ee5d27d0aaca395b62c8f Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 01 二月 2024 14:42:14 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1
---
exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java
index 98d0db3..42eb86f 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java
@@ -40,6 +40,8 @@
import java.util.Map;
import java.util.stream.Collectors;
+import static com.ruoyi.common.utils.PageUtils.startPage;
+
/**
* @author Mr.huang
* @decription
@@ -340,6 +342,7 @@
@Override
public List<GetTeacherRespDTO> selectTeacherAll(Integer isCm) {
+ startPage();
LambdaQueryWrapper<TeacherManage> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TeacherManage::getDelFlag,DeleteStatusEnum.NO.getStatus())
.eq(TeacherManage::getIsCm,isCm);
@@ -352,7 +355,39 @@
dtos.add(dto);
}
return dtos;
+ }
+ @Override
+ public List<GetTeacherRespDTO> selectTeacherByCondition(int isCm, Long operateTypeId) {
+ if (operateTypeId == null || operateTypeId == 0)
+ return selectTeacherAll(isCm);
+ LambdaQueryWrapper<TeacherManageOperateTypeBind> wrapper = new LambdaQueryWrapper<>();
+ List<TeacherManageOperateTypeBind> teacherManageOperateTypeBinds =
+ teacherManageOperateTypeBindService.list(wrapper.eq(TeacherManageOperateTypeBind::getOperateTypeId, operateTypeId)
+ .eq(TeacherManageOperateTypeBind::getDelFlag,DeleteStatusEnum.NO.getStatus()));
+ if (CollectionUtils.isEmpty(teacherManageOperateTypeBinds)){
+ return new ArrayList<>();
+ }
+ List<Long> teacherManageIds = teacherManageOperateTypeBinds.stream()
+ .map(TeacherManageOperateTypeBind::getTeacherManageId)
+ .distinct()
+ .collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(teacherManageIds))
+ return new ArrayList<>();
+ startPage();
+ LambdaQueryWrapper<TeacherManage> teacherManageWrapper = new LambdaQueryWrapper<>();
+ teacherManageWrapper.eq(TeacherManage::getDelFlag,DeleteStatusEnum.NO.getStatus())
+ .eq(TeacherManage::getIsCm,isCm)
+ .in(TeacherManage::getId,teacherManageIds);
+ List<TeacherManage> list = teacherManageService.list(teacherManageWrapper);
+ if (CollectionUtils.isEmpty(list))
+ return new ArrayList<>();
+ List<GetTeacherRespDTO> dtos = new ArrayList<>();
+ for (TeacherManage manage : list) {
+ GetTeacherRespDTO dto = getTeacherRespDTO(manage);
+ dtos.add(dto);
+ }
+ return dtos;
}
@Override
--
Gitblit v1.9.2