From 97875ee7505417c08ae923859d923183e5cce915 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 03 七月 2024 21:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/service/impl/EducationResourceServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/EducationResourceServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/EducationResourceServiceImpl.java
index 97380a9..374f718 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/EducationResourceServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/EducationResourceServiceImpl.java
@@ -4,10 +4,12 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.EducationResource;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.domain.vo.admin.education.EducationResourceVO;
import com.ycl.jxkg.domain.vo.student.education.StudentOnlineVO;
+import com.ycl.jxkg.mapper.ClassesUserMapper;
import com.ycl.jxkg.mapper.EducationResourceMapper;
import com.ycl.jxkg.mapper.SubjectMapper;
import com.ycl.jxkg.service.EducationResourceService;
@@ -16,6 +18,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -30,6 +33,8 @@
private final EducationResourceMapper mapper;
private final SubjectMapper subjectMapper;
+ private final WebContext webContext;
+ private final ClassesUserMapper classesUserMapper;
@Override
public Result add(EducationResourceVO form) {
@@ -41,6 +46,7 @@
}
educationResource.setCreateTime(new Date());
educationResource.setUpdateTime(new Date());
+ educationResource.setCreateUser(webContext.getCurrentUser().getId());
mapper.add(educationResource);
return Result.ok("娣诲姞鎴愬姛");
}
@@ -80,9 +86,17 @@
}
@Override
- public Result byType(StudentOnlineVO query) {
+ public Result studentPage(EducationResourceVO query) {
+ Integer id = webContext.getCurrentUser().getId();
+ List<Integer> classes = classesUserMapper.getClassesByUserId(id);
+ if (CollectionUtils.isEmpty(classes)) {
+ //瀛︾敓娌℃湁鐝骇
+ List<EducationResourceVO> list = new ArrayList<>();
+ return Result.ok(list).put("total", 0);
+ }
+ query.setClassIds(classes);
PageInfo<EducationResourceVO> page = PageHelper.startPage(query.getPageNum(), query.getPageSize()).doSelectPageInfo(() ->
- mapper.byType(query));
+ mapper.studentPage(query));
page.getList().stream().forEach(item -> {
item.setContentUrl(JSON.parseObject(item.getContentUrlString(), EducationResourceVO.UploadFile.class));
item.setAttachment(JSON.parseArray(item.getAttachmentString(), EducationResourceVO.UploadFile.class));
--
Gitblit v1.8.0