master
cody 2 weeks ago
parent 4db39f633e
commit 12764fe4ae

@ -246,21 +246,21 @@ class OtherController extends CommonController
// 条件2course id 筛选(或关系) // 条件2course id 筛选(或关系)
if ($courses && $courses->count() > 0) { if ($courses && $courses->count() > 0) {
if ($hasCondition) { // if ($hasCondition) {
$query->orWhereHas('course', function ($q) use ($courses) { // $query->orWhereHas('course', function ($q) use ($courses) {
$q->whereIn('id', $courses->pluck('id')); // $q->whereIn('id', $courses->pluck('id'));
}); // });
} else { // } else {
$query->whereHas('course', function ($q) use ($courses) { // $query->whereHas('course', function ($q) use ($courses) {
$q->whereIn('id', $courses->pluck('id')); // $q->whereIn('id', $courses->pluck('id'));
}); // });
} // }
} }
})->get(); })->get();
$list['course_total'] = (clone $calendar)->count(); $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'); $course_ids = $courses->pluck('id');

Loading…
Cancel
Save