From b9c9e52187fd8f47218ddefa514987c59d98f72c Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 20 六月 2024 11:25:07 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
index b77c602..1f7d72f 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
@@ -177,7 +177,6 @@
List<List<TSubject>> subjectList = new ArrayList<>();
for (TStudyListen studyListen : studyListens) {
List<String> subjectIds = Arrays.stream(studyListen.getSubject().split(",")).collect(Collectors.toList());
- Collections.shuffle(subjectIds);
List<TSubject> list = new ArrayList<>();
// 图片及语音集合
for (String id : subjectIds) {
@@ -211,7 +210,6 @@
List<List<TSubject>> subjectList = new ArrayList<>();
for (TStudyLook studyLook : lookList) {
List<String> subjectIds = Arrays.stream(studyLook.getSubject().split(",")).collect(Collectors.toList());
- Collections.shuffle(subjectIds);
List<TSubject> list = new ArrayList<>();
// 图片及语音集合
for (String id : subjectIds) {
@@ -245,7 +243,6 @@
List<List<TSubject>> subjectList = new ArrayList<>();
for (TStudyInduction data : inductionList) {
List<String> subjectIds = Arrays.stream(data.getSubject().split(",")).collect(Collectors.toList());
- Collections.shuffle(subjectIds);
List<TSubject> subjectLists = new ArrayList<>();
for (String id : subjectIds) {
if (id.startsWith("-")) {
@@ -336,7 +333,6 @@
List<List<TSubject>> subjectList = new ArrayList<>();
for (TStudyPair data : pair) {
List<String> subjectIds = Arrays.stream(data.getSubject().split(",")).collect(Collectors.toList());
- Collections.shuffle(subjectIds);
List<TSubject> subjectLists = new ArrayList<>();
for (String id : subjectIds) {
if (id.startsWith("-")) {
@@ -379,7 +375,8 @@
defaultSchedule = 0;
}
// 进度学习完成度计算总学习进度
- if (!Constants.ZERO.equals(listen) && !Constants.BURDEN_ONE.equals(listen)) {
+ // todo 不确定是否需要累计计算 中途退出的进度
+ /*if (!Constants.ZERO.equals(listen) && !Constants.BURDEN_ONE.equals(listen)) {
defaultSchedule += 4 * (100 / listen);
}
if (!Constants.ZERO.equals(look) && !Constants.BURDEN_ONE.equals(look)) {
@@ -393,7 +390,7 @@
}
if (!Constants.ZERO.equals(pair) && !Constants.BURDEN_ONE.equals(pair)) {
defaultSchedule += 4 * (100 / pair);
- }
+ }*/
}
return defaultSchedule;
}
--
Gitblit v1.7.1