|
@@ -23,11 +23,17 @@ class LearnQuestion extends Api{
|
|
// 接收参数
|
|
// 接收参数
|
|
$courseId = request('course_id',0);
|
|
$courseId = request('course_id',0);
|
|
// 查询课程数据
|
|
// 查询课程数据
|
|
- $questionList = $Model->query()->where([['course_id','=',$courseId],['status','=',0]])->orderBy('play_time')->select(['question_id','play_time'])->get()->toArray();
|
|
|
|
|
|
+ $questionList = $Model->getList($courseId);
|
|
// 获取数据
|
|
// 获取数据
|
|
foreach ($questionList as $key => $value) {
|
|
foreach ($questionList as $key => $value) {
|
|
# 获取习题数据
|
|
# 获取习题数据
|
|
$value['question_title']= $VideoQuestion->getOne($value['question_id'],'title');
|
|
$value['question_title']= $VideoQuestion->getOne($value['question_id'],'title');
|
|
|
|
+ // 如果没有题目选项,删除
|
|
|
|
+ if( !$value['question_title'] ){
|
|
|
|
+ // 如果没有题目选项,删除
|
|
|
|
+ unset($questionList[$key]);
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
$value['answer_list'] = $VideoAnswer->getListByQuestion($value['question_id']);
|
|
$value['answer_list'] = $VideoAnswer->getListByQuestion($value['question_id']);
|
|
$value['answer_list'] = array_values($value['answer_list']);
|
|
$value['answer_list'] = array_values($value['answer_list']);
|
|
// 如果没有题目选项,删除
|
|
// 如果没有题目选项,删除
|