|
|
|
|
@ -84,12 +84,12 @@ class GateController extends CommonController
|
|
|
|
|
$query->where('idcard', $all['idcard']);
|
|
|
|
|
}
|
|
|
|
|
if (isset($all['start_date']) && isset($all['end_date'])) {
|
|
|
|
|
$query->where(function ($q) use ($all) {
|
|
|
|
|
$q->whereBetween('start_date', [$all['start_date'], $all['end_date']])
|
|
|
|
|
->orWhereBetween('end_date', [$all['start_date'], $all['end_date']]);
|
|
|
|
|
});
|
|
|
|
|
// 查询日期范围与数据库日期范围有交集
|
|
|
|
|
$query->where('start_date', '<=', $all['end_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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|