Skip to content

L
laravelzh
Commit 1abdd4ac authored by Administrator's avatar Administrator
Browse files
Options

更新订单列表

parent 6fa4bbb1
Pipeline #229 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 0 deletions
      app/Http/Controllers/AlarmOrderController.php
      View file @ 1abdd4ac
      ...@@ -65,6 +65,7 @@ class AlarmOrderController extends Controller ...@@ -65,6 +65,7 @@ class AlarmOrderController extends Controller
      ->where($where) ->where($where)
      ->whereBetween('alarm_order.created_at',$whereBetween) ->whereBetween('alarm_order.created_at',$whereBetween)
      ->limit($limit) ->limit($limit)
      ->orderByDesc('id')
      ->get()->toArray(); ->get()->toArray();
      $count = AlarmOrder::leftjoin('reportpolice AS r', 'r.id', '=', 'alarm_order.reportpolice_id') $count = AlarmOrder::leftjoin('reportpolice AS r', 'r.id', '=', 'alarm_order.reportpolice_id')
      ->leftjoin('users AS u', 'alarm_order.user_id', '=', 'u.id') ->leftjoin('users AS u', 'alarm_order.user_id', '=', 'u.id')
      ...@@ -97,6 +98,7 @@ class AlarmOrderController extends Controller ...@@ -97,6 +98,7 @@ class AlarmOrderController extends Controller
      ->leftjoin('device_type AS t', 'r.policestatus', '=', 't.tid') ->leftjoin('device_type AS t', 'r.policestatus', '=', 't.tid')
      ->whereIn('alarm_order.state',explode(',',$request->input('userstate'))) ->whereIn('alarm_order.state',explode(',',$request->input('userstate')))
      ->where('u.id','=',Auth::id()) ->where('u.id','=',Auth::id())
      ->orderByDesc('id')
      ->get()->toArray(); ->get()->toArray();
      return $this->jsonSuccessData($orders); return $this->jsonSuccessData($orders);
      } }
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment