...
|
...
|
@@ -1649,11 +1649,11 @@ class CommonController extends RestBaseController |
|
|
$endTime = isset($data['end_time'])&&!empty($data['end_time'])?$data['end_time']:'';
|
|
|
if (!empty($startTime)) {
|
|
|
$startTime = strtotime(date('Y-m-d',$startTime));
|
|
|
$query->where($train_time, '>=', $startTime);
|
|
|
$query->where($train_time, '>', $startTime);
|
|
|
}
|
|
|
if (!empty($endTime)) {
|
|
|
$endTime = strtotime(date('Y-m-d',$endTime))+86400;
|
|
|
$query->where($train_time, '<=', $endTime);
|
|
|
$query->where($train_time, '<', $endTime);
|
|
|
}
|
|
|
})
|
|
|
->page($data['page'],$limit)
|
...
|
...
|
|