作者 zhl

添加开始结束时间查询

... ... @@ -789,6 +789,8 @@ class ProjectController extends BaseController
$company = $this->param['company'] ?? '';
$order_by_field = $request->input('order_by_field', 'id');
$order_by_sort = $request->input('order_by_sort', 'desc');
$start_time = $this->param['start_time'] ?? '';
$end_time = $this->param['end'] ?? '';
if(!$source_id && !$id){
$this->response('参数异常',Code::SYSTEM_ERROR);
... ... @@ -815,7 +817,7 @@ class ProjectController extends BaseController
$data = Project::with(['deploy_build', 'deploy_optimize', 'online_check'])
->where('delete_status', 0)
->where(function ($query) use ($channel_id, $type, $company, $id, $notice_order_id){
->where(function ($query) use ($channel_id, $type, $company, $id, $notice_order_id, $start_time, $end_time){
if ($channel_id) {
$query->where('channel->channel_id', $channel_id);
}
... ... @@ -831,6 +833,9 @@ class ProjectController extends BaseController
if ($notice_order_id) {
$query->whereIn('notice_order_id', $notice_order_id);
}
if ($start_time && $end_time ) {
$query->whereBetween('uptime', [$start_time, $end_time]);
}
})->orderBy($order_by_field, $order_by_sort)->paginate($size)->toArray();
$list = [];
foreach ($data['list'] as $item){
... ...