|
|
|
@ -88,8 +88,7 @@ class GateController extends CommonController
|
|
|
|
$query->where('start_date', '<=', $all['end_date'])
|
|
|
|
$query->where('start_date', '<=', $all['end_date'])
|
|
|
|
->where('end_date', '>=', $all['start_date']);
|
|
|
|
->where('end_date', '>=', $all['start_date']);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc')->paginate($all['page_size'] ?? 20);
|
|
|
|
})->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc')->paginate($all['page_size'] ?? 20);;
|
|
|
|
;
|
|
|
|
|
|
|
|
return $this->success($list);
|
|
|
|
return $this->success($list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|