修改网格化接口

Modules/Admin/Http/Controllers/Api/ApiController.php

@@ -115,11 +115,11 @@ class ApiController extends BaseController
         $start_date = Input::get('start_date', '');
         $end_date = Input::get('end_date', '');
         $depart = Input::get('depart', '');
-        $person_id = Input::get('person_id', '');
+        $person = Input::get('person', '');
         if (!$start_date || !$end_date) {
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
-        $result = ApiService::getFinalList($start_date, $end_date, $depart, $person_id);
+        $result = ApiService::getFinalList($start_date, $end_date, $depart, $person);
         return self::successResponse($result);
     }
 }

Modules/Admin/Services/ApiService.php

@@ -364,7 +364,7 @@ class ApiService{
     }
 
     //网格化巡检记录
-    public static function getFinalList($start_date, $end_date, $depart = '', $person_id = '')
+    public static function getFinalList($start_date, $end_date, $depart = '', $person = '')
     {
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
@@ -382,8 +382,10 @@ class ApiService{
             $query = $query->where('xjdw', $depart);
         }
 
-        if ($person_id) {
-            $query = $query->where('lrr', $person_id);
+        if ($person) {
+            $person_id = DB::connection('mysql_fwview')->table('hrmresource')
+                           ->where('lastname', 'like', '%' . $person . '%')->value('id')->all();
+            $query = $query->whereIn('lrr', $person_id);
         }
 
         $query = $query->orderBy('lrdate', 'desc')->groupBy('lrdate', 'xjdw', 'lrr')