作者 zhl

添加开始结束时间查询

@@ -789,6 +789,8 @@ class ProjectController extends BaseController @@ -789,6 +789,8 @@ class ProjectController extends BaseController
789 $company = $this->param['company'] ?? ''; 789 $company = $this->param['company'] ?? '';
790 $order_by_field = $request->input('order_by_field', 'id'); 790 $order_by_field = $request->input('order_by_field', 'id');
791 $order_by_sort = $request->input('order_by_sort', 'desc'); 791 $order_by_sort = $request->input('order_by_sort', 'desc');
  792 + $start_time = $this->param['start_time'] ?? '';
  793 + $end_time = $this->param['end'] ?? '';
792 794
793 if(!$source_id && !$id){ 795 if(!$source_id && !$id){
794 $this->response('参数异常',Code::SYSTEM_ERROR); 796 $this->response('参数异常',Code::SYSTEM_ERROR);
@@ -815,7 +817,7 @@ class ProjectController extends BaseController @@ -815,7 +817,7 @@ class ProjectController extends BaseController
815 817
816 $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check']) 818 $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check'])
817 ->where('delete_status', 0) 819 ->where('delete_status', 0)
818 - ->where(function ($query) use ($channel_id, $type, $company, $id, $notice_order_id){ 820 + ->where(function ($query) use ($channel_id, $type, $company, $id, $notice_order_id, $start_time, $end_time){
819 if ($channel_id) { 821 if ($channel_id) {
820 $query->where('channel->channel_id', $channel_id); 822 $query->where('channel->channel_id', $channel_id);
821 } 823 }
@@ -831,6 +833,9 @@ class ProjectController extends BaseController @@ -831,6 +833,9 @@ class ProjectController extends BaseController
831 if ($notice_order_id) { 833 if ($notice_order_id) {
832 $query->whereIn('notice_order_id', $notice_order_id); 834 $query->whereIn('notice_order_id', $notice_order_id);
833 } 835 }
  836 + if ($start_time && $end_time ) {
  837 + $query->whereBetween('uptime', [$start_time, $end_time]);
  838 + }
834 })->orderBy($order_by_field, $order_by_sort)->paginate($size)->toArray(); 839 })->orderBy($order_by_field, $order_by_sort)->paginate($size)->toArray();
835 $list = []; 840 $list = [];
836 foreach ($data['list'] as $item){ 841 foreach ($data['list'] as $item){