From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题
---
src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java
index b62c392..7dbf200 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java
@@ -7,10 +7,11 @@
import com.mindskip.xzs.domain.OnlineStudy;
import com.mindskip.xzs.domain.question.QuestionObject;
import com.mindskip.xzs.domain.vo.OnlineStudyVO;
+import com.mindskip.xzs.domain.vo.StudentOnlineVO;
+import com.mindskip.xzs.domain.vo.StudyTypeVO;
import com.mindskip.xzs.repository.OnlineStudyMapper;
+import com.mindskip.xzs.repository.StudyTypeMapper;
import com.mindskip.xzs.service.OnlineStudyService;
-import com.mindskip.xzs.utility.JsonUtil;
-import jdk.nashorn.internal.ir.IfNode;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -19,7 +20,6 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
-import java.util.stream.Collectors;
/**
* @author锛歺p
@@ -30,12 +30,15 @@
public class OnlineStudySeerviceImpl implements OnlineStudyService {
private final OnlineStudyMapper mapper;
+ private final StudyTypeMapper studyTypeMapper;
@Override
public RestResponse add(OnlineStudyVO form) {
OnlineStudy onlineStudy = new OnlineStudy();
BeanUtils.copyProperties(form, onlineStudy);
- onlineStudy.setContentUrl(JSON.toJSONString(form.getContentUrl()));
+ if (Objects.nonNull(form.getContentUrl())) {
+ onlineStudy.setContentUrl(JSON.toJSONString(form.getContentUrl()));
+ }
if (! CollectionUtils.isEmpty(form.getAttachment())) {
onlineStudy.setAttachment(JSON.toJSONString(form.getAttachment()));
}
@@ -70,7 +73,6 @@
@Override
public RestResponse page(OnlineStudyVO query) {
- PageHelper.startPage(query.getPageNum(), query.getPageSize());
PageInfo<OnlineStudyVO> page = PageHelper.startPage(query.getPageNum(), query.getPageSize()).doSelectPageInfo(() ->
mapper.page(query));
page.getList().stream().forEach(item -> {
@@ -79,4 +81,21 @@
});
return RestResponse.ok(page.getList()).put("total", page.getTotal());
}
+
+ @Override
+ public RestResponse byType(StudentOnlineVO query) {
+ PageInfo<OnlineStudyVO> page = PageHelper.startPage(query.getPageNum(), query.getPageSize()).doSelectPageInfo(() ->
+ mapper.byType(query));
+ page.getList().stream().forEach(item -> {
+ item.setContentUrl(JSON.parseObject(item.getContentUrlString(), OnlineStudyVO.UploadFile.class));
+ item.setAttachment(JSON.parseArray(item.getAttachmentString(), OnlineStudyVO.UploadFile.class));
+ });
+ return RestResponse.ok(page.getList()).put("total", page.getTotal());
+ }
+
+ @Override
+ public RestResponse typeList() {
+ List<StudyTypeVO> list = studyTypeMapper.list();
+ return RestResponse.ok(list);
+ }
}
--
Gitblit v1.8.0