master
cody 2 weeks ago
parent 4d19587fd5
commit 2382a33ce1

@ -275,8 +275,8 @@ class OtherController extends CommonController
// 附加历史课程数据
$historyCourses = HistoryCourse::where(function ($query) use ($start_date, $end_date) {
// 开始结束日期的筛选。or查询
$query->whereBetween('start_date', [$start_date, $end_date])
->orWhereBetween('end_date', [$start_date, $end_date]);
$query->whereBetween('start_time', [$start_date, $end_date])
->orWhereBetween('end_time', [$start_date, $end_date]);
})->where('type', $course_type_id)->get();
foreach ($historyCourses as $historyCourse) {
$courseTypesSum[] = [

Loading…
Cancel
Save