From 34e183fbfed4688f25b375d4966b937f52228827 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 17 六月 2024 10:34:19 +0800
Subject: [PATCH] 报错
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 81afdb0..ea1713a 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
@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.StudyWeekDTO;
+import com.ruoyi.study.vo.*;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -31,10 +31,9 @@
*
* @param userId 用户id
* @param week 周目
- * @param day 所属day
* @return 学习信息
*/
- TUserStudy studySchedule(String userId, Integer week, Integer day);
+ TUserStudy studySchedule(String userId, Integer week);
/**
* 自主学习1-听音选图
@@ -44,7 +43,7 @@
* @param studyListens 数据集合
* @return 单个题组下所包含的所有图片及语音
*/
- Map<String, Object> listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens);
+ StudyListenResultVO listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens);
/**
* 自主游戏1-超级听力
@@ -63,7 +62,7 @@
* @param lookList 数据集合
* @return 单个题组下所包含的所有图片及语音
*/
- Map<String, Object> pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList);
+ StudyLookResultVO pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList);
/**
* 自主学习3-归纳排除
@@ -73,7 +72,7 @@
* @param inductionList 归纳排除
* @return 题目信息
*/
- Map<String, Object> induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList);
+ StudyInductionResultVO induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList);
/**
* 自主学习4-有问有答
@@ -83,7 +82,7 @@
* @param answerList 有问有答
* @return 题目信息
*/
- Map<String, Object> questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList);
+ StudyAnswerResultVO questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList);
/**
* 自主学习5-音图相配
@@ -93,6 +92,6 @@
* @param pair 音图相配
* @return 题目信息
*/
- Map<String, Object> pictureMateVoice(Integer week, Integer day, TStudyPair pair);
+ StudyPairResultVO pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair);
}
--
Gitblit v1.7.1