添加网格化人员轨迹接口

Modules/Admin/Services/ApiService.php

@@ -23,6 +23,10 @@ class ApiService{
 
     public static function getQueryConitions($date = '')
     {
+        $result['status'] = true;
+        $result['msg']    = ApiEnum::RETURN_SUCCESS;
+        $result['data']   = [];
+
         if (!$date) {
             $date = date('Y-m-d', time());
         }
@@ -34,23 +38,29 @@ class ApiService{
 
         $depart_arr = [];
         foreach ($depart as $key => $val) {
+            $depart_arr[$key] = [
+                'name' => $val->DEPARTMENTNAME,
+
+            ];
             $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
                        ->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
-                       ->where('xjdw1', $val->departmentname)
+                       ->where('xjdw1', $val->DEPARTMENTNAME)
                        ->where('lrsj', 'like', '%' . $date . '%')
-                       ->groupBy('lrr')
-                       ->orderBy('lrsj', 'asc')->select(
-                    [
-                        'hrmresource.lastname as person_name',
-                        'uf_wghgl_new.lrr as person_id   '
-                    ]
-                )->get();
-            dd($query);
-            $depart_arr[] = [
-                'name' => $val->departmentname,
-
-            ];
+                       ->groupBy('lrr')->select(
+                            [
+                                'hrmresource.lastname as person_name',
+                                'uf_wghgl_new.lrr as person_id   '
+                            ]
+                        )->get();
+            $query = json_decode($query);
+            if ($query) {
+                $depart_arr[$key]['person_list'] = $query;
+            }
         }
+        dd($depart_arr);
+        $result['data'] = $depart_arr;
+
+        return $result;
     }
 
     public static function getPersonTravel($person_id, $date = '')