|
|
|
@ -232,7 +232,7 @@ class OtherController extends CommonController
|
|
|
|
// 开课场次
|
|
|
|
// 开课场次
|
|
|
|
// 开课场次
|
|
|
|
// 开课场次
|
|
|
|
$calendar = Calendar::where(function ($query) use ($start_date, $end_date) {
|
|
|
|
$calendar = Calendar::where(function ($query) use ($start_date, $end_date) {
|
|
|
|
$query->whereBetween('start_time1', [$start_date, $end_date])
|
|
|
|
$query->whereBetween('start_time', [$start_date, $end_date])
|
|
|
|
->orWhereBetween('end_time', [$start_date, $end_date]);
|
|
|
|
->orWhereBetween('end_time', [$start_date, $end_date]);
|
|
|
|
})->where(function ($query) use ($course_type_id) {
|
|
|
|
})->where(function ($query) use ($course_type_id) {
|
|
|
|
// 条件1:有 course_id 的数据,通过 course.type 匹配课程体系
|
|
|
|
// 条件1:有 course_id 的数据,通过 course.type 匹配课程体系
|
|
|
|
|