From 0dfecde9ebe89ec797b273823c52e44baf056df6 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 24 六月 2024 09:51:54 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish --- ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 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..b493ae8 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,9 +22,10 @@ * * @param type 所属类型 * @param quarter 季度 + * @param userId 用户id * @return 列表 */ - List<StudyWeekDTO> weekList(Integer type, Integer quarter); + List<StudyWeekDTO> weekList(Integer type, Integer quarter, Integer userId); /** * 获取学习进度及学习时长等信息 @@ -115,11 +115,11 @@ 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); } -- Gitblit v1.7.1