|
|
|
|
@ -89,8 +89,8 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
}
|
|
|
|
|
})->whereHas('course', function ($query) use ($start_date, $end_date) {
|
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|
// $query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
// ->whereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
})->whereHas('user', function ($query) use ($area) {
|
|
|
|
|
if (isset($area)) {
|
|
|
|
|
if ($area == '苏州市外') {
|
|
|
|
|
|