Compare commits

..

No commits in common. 'e037b0a74d7ea50b3807fa0a565e887701c9b32f' and 'a9b2bbb78123e8e146687efa8d5729ca27ebe83b' have entirely different histories.

@ -90,10 +90,8 @@ class CourseSign extends SoftDeletesModel
$query->where('is_chart', 1);
// 开始结束日期的筛选。or查询
if ($start_date && $end_date) {
$query->where(function ($query) use ($start_date, $end_date) {
$query->whereBetween('start_date', [$start_date, $end_date])
->orWhereBetween('end_date', [$start_date, $end_date]);
});
$query->whereBetween('start_date', [$start_date, $end_date])
->orWhereBetween('end_date', [$start_date, $end_date]);
}
})->whereNotIn('status', [4, 5, 6]);
return $baseQuery;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save