diff --git a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java index ae10fc9..11fc07d 100644 --- a/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java +++ b/enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java @@ -63,6 +63,8 @@ public class LessonPlansServiceImpl implements LessonPlansService { GradeUnitDO gradeUnitDO = gradeUnitDOMapper.selectByUnitId(unitId); GradeDO gradeDO = gradeDOMapper.selectById(gradeUnitDO.getGradeId()); + List totalWords = new ArrayList<>(); + // 补差词汇所用词汇的 List vocabularyBankListStudentNotMaster = getVocabListRandom(vocabularyBankDOMapper .selectVocabularyBankListStudentNotMaster(gradeUnitDO.getGradeId(), studentId), 50); @@ -85,6 +87,10 @@ public class LessonPlansServiceImpl implements LessonPlansService { List gapVocabList = vocabularyBankListStudentNotMaster.subList(i * countGap, Math.min(i * countGap + countGap, gapSize)); weeksSync.add(syncVocabList); weeksGap.add(gapVocabList); + + totalWords.addAll(syncVocabList); + totalWords.addAll(gapVocabList); + List reviewVocabList = new ArrayList<>(); List checkList = new ArrayList<>(); // 艾宾浩斯遗忘曲线 @@ -149,9 +155,9 @@ public class LessonPlansServiceImpl implements LessonPlansService { try { - int syncWeekender = syncSize / 2; + int syncWeekendSize = totalWords.size() / 2; for (int i = 0; i < 2; i++) { - List checkList = vocabularyBankDOS.subList(i * syncWeekender, Math.min((i + 1) * syncWeekender, syncSize)); + List checkList = totalWords.subList(i * syncWeekendSize, Math.min((i + 1) * syncWeekendSize, syncWeekendSize)); Map map = generateWeekendPlans(checkList, i + 6, gradeDO, unitDO, studentId); LessonPlansDO lessonPlansDO = LessonPlansDO.builder()