Skip to content

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

更新报警记录API

parent 0553af02
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
app/Http/Controllers/DevicesController.php
View file @ c5922fb0
...@@ -400,6 +400,7 @@ class DevicesController extends Controller ...@@ -400,6 +400,7 @@ class DevicesController extends Controller
->join('status as s', 'r.policestatus', '=', 's.id') ->join('status as s', 'r.policestatus', '=', 's.id')
->join('device as d', 'r.devicenumber', '=', 'd.devicenum') ->join('device as d', 'r.devicenumber', '=', 'd.devicenum')
->select('r.*', 's.status_name', 'd.id as deid') ->select('r.*', 's.status_name', 'd.id as deid')
->orderByDesc('r.starttime')
->get(); ->get();
} else { } else {
$data = DB::table('reportpolice as r') $data = DB::table('reportpolice as r')
...@@ -407,6 +408,7 @@ class DevicesController extends Controller ...@@ -407,6 +408,7 @@ class DevicesController extends Controller
->join('device as d', 'r.devicenumber', '=', 'd.devicenum') ->join('device as d', 'r.devicenumber', '=', 'd.devicenum')
->where('d.uid', '=', Auth::id()) ->where('d.uid', '=', Auth::id())
->select('r.*', 's.status_name', 'd.id as deid') ->select('r.*', 's.status_name', 'd.id as deid')
->orderByDesc('r.starttime')
->get(); ->get();
} }
return $this->jsonSuccessData($data); return $this->jsonSuccessData($data);
......
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