qiuzijian 1 год назад
Родитель
Сommit
e0ef2a951a
2 измененных файлов с 13 добавлено и 6 удалено
  1. 1 1
      Modules/Admin/Routes/api.php
  2. 12 5
      Modules/Admin/Services/ApiService.php

+ 1 - 1
Modules/Admin/Routes/api.php

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

+ 12 - 5
Modules/Admin/Services/ApiService.php

@@ -165,11 +165,18 @@ class ApiService{
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
         $result['data']   = [];
 
-//        $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
-//                   ->where('lrr', $person_id)
-//                   ->where('lrsj', 'like', '%' . $date . '%')
-//                   ->where('xjdw1', $depart)
-//                   ->orderBy('lrsj', 'asc')->get();
+        $query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
+                   ->groupBy('lrdate, lrr, xjdw')
+                   ->select(
+                       [
+                           DB::raw('DATE(lrsj) as lrdate'),
+                           'lrr',
+                           'xjdw'
+                       ]
+                   )
+                   ->get();
+
+        dd($query);
 
         return $result;
     }