|
|
|
|
@ -246,21 +246,21 @@ class OtherController extends CommonController
|
|
|
|
|
|
|
|
|
|
// 条件2:course id 筛选(或关系)
|
|
|
|
|
if ($courses && $courses->count() > 0) {
|
|
|
|
|
if ($hasCondition) {
|
|
|
|
|
$query->orWhereHas('course', function ($q) use ($courses) {
|
|
|
|
|
$q->whereIn('id', $courses->pluck('id'));
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
$query->whereHas('course', function ($q) use ($courses) {
|
|
|
|
|
$q->whereIn('id', $courses->pluck('id'));
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
// if ($hasCondition) {
|
|
|
|
|
// $query->orWhereHas('course', function ($q) use ($courses) {
|
|
|
|
|
// $q->whereIn('id', $courses->pluck('id'));
|
|
|
|
|
// });
|
|
|
|
|
// } else {
|
|
|
|
|
// $query->whereHas('course', function ($q) use ($courses) {
|
|
|
|
|
// $q->whereIn('id', $courses->pluck('id'));
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
})->get();
|
|
|
|
|
|
|
|
|
|
$list['course_total'] = (clone $calendar)->count();
|
|
|
|
|
// 开课天数
|
|
|
|
|
$list['course_day_total'] = (clone $calendar)->sum('days');
|
|
|
|
|
$list['course_day_total'] = (clone $calendar)->where('is_count_days', 1)->sum('days');
|
|
|
|
|
|
|
|
|
|
$course_ids = $courses->pluck('id');
|
|
|
|
|
|
|
|
|
|
|