全流程巡检接口修改

Modules/Admin/Routes/api.php

@@ -23,23 +23,23 @@ Route::namespace('Api')->group(function () {
     Route::post('check_token', 'TokenController@checkToken');
 
     //网格化录入
-    Route::post('fanwei/add_conition', 'ApiController@addConition');
+    Route::post('fanwei/add_conition', 'ApiController@addConition');//1
     //网格化人员轨迹查询条件
-    Route::post('fanwei/get_query_conition', 'ApiController@getQueryConition');
+    Route::post('fanwei/get_query_conition', 'ApiController@getQueryConition');//5
     //网格化人员轨迹
-    Route::post('fanwei/get_person_travel', 'ApiController@getPersonTravel');
+    Route::post('fanwei/get_person_travel', 'ApiController@getPersonTravel');//4
     //网格化巡检记录查询条件
-    Route::post('fanwei/get_result_conition', 'ApiController@getResultConition');
+    Route::post('fanwei/get_result_conition', 'ApiController@getResultConition');//7
     //网格化巡检记录查询
-    Route::post('fanwei/get_result_record', 'ApiController@getResultRecord');
+    Route::post('fanwei/get_result_record', 'ApiController@getResultRecord');//9
     //网格化巡检记录列表
     Route::post('fanwei/get_result_list', 'ApiController@getResultList');
     //网格化巡检记录列表明细
-    Route::post('fanwei/get_result_dlist', 'ApiController@getResultDlist');
+    Route::post('fanwei/get_result_dlist', 'ApiController@getResultDlist');//2
     //网格化巡检记录明细
-    Route::post('fanwei/get_result_detail', 'ApiController@getResultDetail');
+    Route::post('fanwei/get_result_detail', 'ApiController@getResultDetail');//3
     //网格化巡检记录
-    Route::post('fanwei/get_final_list', 'ApiController@getFinalList');
+    Route::post('fanwei/get_final_list', 'ApiController@getFinalList');//8
 
     //短信发送
     Route::post('sms/send_meeting_sms', 'SmsController@sendMeetingSms');

Modules/Admin/Services/ApiService.php

@@ -207,7 +207,7 @@ class ApiService{
                 continue;
             }
 
-            if ($detail >= $allcount) {
+//            if ($detail >= $allcount) {
                 $data[$val->lrr] = [
                     'department' => $val->dwmc,
                     'lastname'   => $lastname,
@@ -218,9 +218,9 @@ class ApiService{
                     'name'  => $lastname,
                     'value' => isset($data[$val->lrr]['value']) ? $data[$val->lrr]['value'] + 1 : 1,
                 ];
-            } else {
-                continue;
-            }
+//            } else {
+//                continue;
+//            }
         }
 
         $data_arr = array_column($data, 'count');