添加网格化接口

Modules/Admin/Routes/api.php

@@ -31,5 +31,5 @@ Route::namespace('Api')->group(function () {
     //网格化巡检记录查询条件
     Route::post('fanwei/get_result_conition', 'ApiController@getResultConition');
     //网格化巡检记录查询
-    Route::get('fanwei/get_result_list', 'ApiController@getResultList');
+    Route::post('fanwei/get_result_list', 'ApiController@getResultList');
 });

Modules/Admin/Services/ApiService.php

@@ -175,7 +175,7 @@ class ApiService{
             $query = $query->where(DB::raw('WEEK(lrsj)'), DB::raw('WEEK(CURDATE())'));
         }
 
-        $query = $query->groupBy('lrdate', 'lrr', 'xjdw')
+        $query = $query->groupBy('lrdate', 'lrr', 'xjdw', 'dwmc')
                    ->select(
                        [
                            DB::raw('DATE(lrsj) as lrdate'),
@@ -187,14 +187,14 @@ class ApiService{
                    ->get();
 
         $allcount = DB::connection('mysql_fwview')->table('formtable_main_974')
-                   ->whereNotIn('szxmc', $depart)->count();
+                   ->where('szxmc', $depart)->count();
 
         $data = [];
         $count = 0;
         foreach ($query as $key => $val) {
             $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
                     ->where('xjdw', $depart)
-                    ->where(DB::raw('DATE(lrsj)', $val->lrdate))
+                    ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
                     ->where('lrr', $val->lrr)->count();
 
             if ($detail >= $allcount) {
@@ -213,7 +213,8 @@ class ApiService{
             }
 
         }
-        dd($data);
+
+        $result['data'] = $data;
 
         return $result;
     }