全流程接口修改

Modules/Admin/Services/ApiService.php

@@ -481,14 +481,15 @@ class ApiService{
             $query = $query->whereIn('lrr', 'like','%'.$person_id.'%');
         }
 
-        $query = $query->orderBy('lrdate', 'desc')->groupBy('lrsj', 'xjdw', 'lrr','jcwt','id')
+        $query = $query->orderBy('lrdate', 'desc')->groupBy('lrsj', 'xjdw', 'lrr','jcwt','id','zgr')
             ->select(
                 [
                     DB::raw('DATE(lrsj) as lrdate'),
                     'xjdw',
                     'lrr',
                     'jcwt',
-                    'id'
+                    'id',
+                    'zgr'
                 ]
             )
             ->get();
@@ -501,13 +502,20 @@ class ApiService{
             }else{
                 $is_complete = 1;
             }
+
+            $zgr = explode('|',$val->zgr);
+            $zgr_id = '';
+            if(count($zgr) > 1){
+                $zgr_id = $zgr[1];
+            }
             $data[] = [
                 'depart'      => $val->xjdw,
                 'lastname'    => $lastname,
                 'person_id'   => $val->lrr,
                 'date'        => $val->lrdate,
                 'is_complete' => $is_complete,
-                'id'          => $val->id
+                'id'          => $val->id,
+                'zgr_id'      => $zgr_id
             ];
 
         }