LeiBoWen/en-edu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: LeiBoWen:b86f37443c6ee42aa747426fcd2b238b66275432
Branches Tags
LeiBoWen:master
...
compare: LeiBoWen:7f2fda16ec23b85d98404595351614d97f22a486
Branches Tags
LeiBoWen:master

2 Commits
b86f37443c ... 7f2fda16ec

Author SHA1 Message Date
LeiBoWen
7f2fda16ec Merge pull request 'fix(lesson-plans): 修正补差词汇汇总及周末计划分割逻辑' (#1) from detached into master 
Reviewed-on: #1
 2025-12-31 16:55:54 +08:00
lbw
9cd43c0e74 fix(lesson-plans): 修正补差词汇汇总及周末计划分割逻辑 
- 新增totalWords列表汇总同步词汇和补差词汇
- 修改周末计划分割逻辑，使用totalWords列表长度均分两部分
- 纠正checkList子列表截取范围，避免越界错误
- 优化学习计划数据构建过程，保证数据完整性
 2025-12-31 16:53:28 +08:00
1 changed files with 8 additions and 2 deletions
Expand all files Collapse all files

10
enlish-service/src/main/java/com/yinlihupo/enlish/service/service/plan/LessonPlansServiceImpl.java
View File

@@ -63,6 +63,8 @@ public class LessonPlansServiceImpl implements LessonPlansService {
GradeUnitDO gradeUnitDO = gradeUnitDOMapper.selectByUnitId(unitId);
GradeDO gradeDO = gradeDOMapper.selectById(gradeUnitDO.getGradeId());
List<VocabularyBankDO> totalWords = new ArrayList<>();
// 补差词汇所用词汇的
List<VocabularyBankDO> vocabularyBankListStudentNotMaster = getVocabListRandom(vocabularyBankDOMapper
.selectVocabularyBankListStudentNotMaster(gradeUnitDO.getGradeId(), studentId), 50);
@@ -85,6 +87,10 @@ public class LessonPlansServiceImpl implements LessonPlansService {
List<VocabularyBankDO> gapVocabList = vocabularyBankListStudentNotMaster.subList(i * countGap, Math.min(i * countGap + countGap, gapSize));
weeksSync.add(syncVocabList);
weeksGap.add(gapVocabList);
totalWords.addAll(syncVocabList);
totalWords.addAll(gapVocabList);
List<VocabularyBankDO> reviewVocabList = new ArrayList<>();
List<VocabularyBankDO> 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<VocabularyBankDO> checkList = vocabularyBankDOS.subList(i * syncWeekender, Math.min((i + 1) * syncWeekender, syncSize));
List<VocabularyBankDO> checkList = totalWords.subList(i * syncWeekendSize, Math.min((i + 1) * syncWeekendSize, syncWeekendSize));
Map<String, Object> map = generateWeekendPlans(checkList, i + 6, gradeDO, unitDO, studentId);
LessonPlansDO lessonPlansDO = LessonPlansDO.builder()