全流程巡检接口修改

Modules/Admin/Services/ApiService.php

@@ -217,9 +217,11 @@ class ApiService{
             ->where('lrr', $person_id)
             ->where('lrsj', 'like', '%' . $date . '%')
             ->where('xjdw', $depart)
-            ->orderBy('lrsj', 'asc')->get();
+            ->orderBy('create_time', 'asc')->get();
         $query = json_decode($query);
 
+        $result['list2'] = [];
+
         if ($query) {
             foreach ($query as $key => $val) {
                 // dd($val);
@@ -230,6 +232,9 @@ class ApiService{
                     'data_id' => $val->ID,
                     'url'     => 'http://anstatic.nxmy.com:8011/assets/html/xixuan/pages/detail.html?id='.$val->ID,
                 ];
+
+                $result['list2'][$key]['area'] = $val->xjqy;
+                $result['list2'][$key]['time'] = $val->CREATE_TIME;
             }
 
             $area_list = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')
@@ -244,7 +249,7 @@ class ApiService{
                 ];
             }
 
-            $result['data'] = $res;
+            $result['list1'] = $res;
         }
 
         return $result;