From c832cae4de3ff53e3b80cad317fbdd84de46c02d Mon Sep 17 00:00:00 2001 From: hjl <1657978663@qq.com> Date: 星期五, 19 七月 2024 09:31:34 +0800 Subject: [PATCH] fix: 学习端bug --- ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java index 4b6653e..e692299 100644 --- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java +++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java @@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.study.domain.*; -import com.ruoyi.study.dto.CompleteGameDTO; import com.ruoyi.study.dto.StudyWeekDTO; import com.ruoyi.study.vo.*; @@ -23,17 +22,19 @@ * * @param type 所属类型 * @param quarter 季度 + * @param userId 用户id * @return 列表 */ - List<StudyWeekDTO> weekList(Integer type, Integer quarter); + List<StudyWeekDTO> weekList(Integer type, Integer quarter, Integer userId); /** * 获取学习进度及学习时长等信息 * - * @param userId 用户id + * @param studyRecord 学习进度 + * @param week 所属周目 * @return 学习信息 */ - TUserStudy studySchedule(String userId); + TUserStudy studySchedule(TUserStudy studyRecord, Integer week); /** * 自主学习1-听音选图 @@ -115,11 +116,19 @@ int computeTotalIntegral(List<String> studyIds, Integer type, Integer accuracy); /** - * 超级记忆正确率达到通关率标准,才能进入下一周目学习 + * 计算剩余学习周目 * - * @param game 游戏信息 - * @param userid 用户id - * @param completeStudy 游戏完成信息 + * @param studyRecord 学习进度信息 + * @param studyList 学习配置列表 + * @return 剩余周目 */ - void checkRate(TGame game, Integer userid, CompleteGameDTO completeStudy); + int residueWeek(TUserStudy studyRecord, List<TStudy> studyList); + + /** + * 校验超级听力是否通过 + * + * @param game 游戏信息 + * @param userid 用户信息 + */ + void checkClearance(TGame game, Integer userid); } -- Gitblit v1.7.1