|
|
|
|
@ -707,9 +707,9 @@ class OtherController extends CommonController
|
|
|
|
|
// 开课场次明细 - 与coursesHome算法一致
|
|
|
|
|
$calendars = Calendar::whereBetween('date', [$start_date, $end_date])
|
|
|
|
|
->where(function ($query) use ($course_ids) {
|
|
|
|
|
$course_type_id = request('course_type_id', '');
|
|
|
|
|
$course_type_id = explode(',', $course_type_id);
|
|
|
|
|
$course_type_id = request('course_type_id');
|
|
|
|
|
if ($course_type_id) {
|
|
|
|
|
$course_type_id = explode(',', $course_type_id);
|
|
|
|
|
$query->whereIn('course_type_id', $course_type_id);
|
|
|
|
|
}
|
|
|
|
|
})->with('course')
|
|
|
|
|
@ -740,8 +740,10 @@ class OtherController extends CommonController
|
|
|
|
|
// 开课天数明细 - 与coursesHome算法一致
|
|
|
|
|
$calendars = Calendar::whereBetween('date', [$start_date, $end_date])
|
|
|
|
|
->where(function ($query) use ($course_ids) {
|
|
|
|
|
if (request('course_type_id')) {
|
|
|
|
|
$query->whereIn('course_type_id', request('course_type_id'));
|
|
|
|
|
$course_type_id = request('course_type_id');
|
|
|
|
|
if ($course_type_id) {
|
|
|
|
|
$course_type_id = explode(',', $course_type_id);
|
|
|
|
|
$query->whereIn('course_type_id', $course_type_id);
|
|
|
|
|
}
|
|
|
|
|
})->where('is_count_days', 1)
|
|
|
|
|
->with('course')
|
|
|
|
|
|