全流程接口修改

Modules/Admin/Services/ApiService.php

@@ -347,9 +347,10 @@ class ApiService{
 
         $query = $query->select(
             [
-                'xjdw',
+                'xjqy',
                 DB::raw('DATE(lrsj) as lrdate'),
-                'lrr'
+                'lrr',
+                'xjdw'
             ]
         )->get();
 
@@ -359,11 +360,11 @@ class ApiService{
 
             $data[] = [
                 'lastname'   => $lrr[0],
-                'person_id'  => $person_id,
+                'person_id'  => $val->lrr,
                 'depart'     => $val->xjdw,
-                'date'       => $val->lrdate
+                'date'       => $val->lrdate,
+                'xjqy'       => $val->xjqy
             ];
-
         }
 
         $data_arr = array_column($data, 'date');