|
|
@@ -32,7 +32,7 @@ class Course extends Api{
|
|
|
// 获取用户学习记录
|
|
|
$record = $LearnRecord->query()->where([['custom_uid','=',$uid]])->groupBy('course_id')->select(['course_id',DB::raw('max(`status`) as status')])->get()->toArray();
|
|
|
// 获取报告
|
|
|
- $report = $ExamRecord->query()->where([['custom_uid','=',$uid],['status','=',1]])->groupBy('course_id')->pluck('id','course_id')->toArray();
|
|
|
+ $reportList = $ExamRecord->query()->where([['custom_uid','=',$uid],['status','=',1]])->groupBy('course_id')->select(['course_id',DB::raw('max(`id`) as id')])->get()->toArray();
|
|
|
// 记录列表
|
|
|
$recordList = [];
|
|
|
// 以课程重组课程状态
|
|
|
@@ -40,6 +40,12 @@ class Course extends Api{
|
|
|
// 重组
|
|
|
$recordList[$value['course_id']] = $value['status'];
|
|
|
}
|
|
|
+ $report = [];
|
|
|
+ // 以课程重组课程状态
|
|
|
+ foreach ($reportList as $key => $value) {
|
|
|
+ // 重组
|
|
|
+ $report[$value['course_id']] = $value['id'];
|
|
|
+ }
|
|
|
// 循环处理数据
|
|
|
foreach ($Paginator as $key => $value) {
|
|
|
// 类型名称
|
