添加网格化接口

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

@@ -66,8 +66,8 @@ class ApiController extends BaseController
     //网格化巡检记录查询
     public function getResultRecord()
     {
-        $depart = Input::get('depart', '');
-        $date_type = Input::get('date_type', '');
+        $depart = Input::get('depart', 'all');
+        $date_type = Input::get('date_type', 'week');
         $result = ApiService::getResultRecord($depart, $date_type);
         return self::successResponse($result);
     }

Modules/Admin/Services/ApiService.php

@@ -190,6 +190,7 @@ class ApiService{
                    ->get();
 
         $data = [];
+        $pie  = [];
         foreach ($query as $key => $val) {
             if ($depart == 'all') {
                 $wghgl = DB::connection('mysql_fwview')->table('uf_wghgl_new')
@@ -215,7 +216,11 @@ class ApiService{
                         $data[$val->lrr] = [
                             'department' => $val->dwmc,
                             'lastname'   => $lastname,
-                            'count'      => isset($data[$val->lrr]['count']) ? $data[$val->lrr]['count'] + 1 : 0,
+                            'count'      => isset($data[$val->lrr]['count']) ? $data[$val->lrr]['count'] + 1 : 1,
+                        ];
+                        $pie[$val->lrr] = [
+                            'name'  => $lastname,
+                            'value' => isset($data[$val->lrr]['value']) ? $data[$val->lrr]['value'] + 1 : 1,
                         ];
                     } else {
                         continue;
@@ -237,7 +242,11 @@ class ApiService{
                     $data[$val->lrr] = [
                         'department' => $val->dwmc,
                         'lastname'   => $lastname,
-                        'count'      => isset($data[$val->lrr]['count']) ? $data[$val->lrr]['count'] + 1 : 0,
+                        'count'      => isset($data[$val->lrr]['count']) ? $data[$val->lrr]['count'] + 1 : 1,
+                    ];
+                    $pie[$val->lrr] = [
+                        'name'  => $lastname,
+                        'value' => isset($data[$val->lrr]['value']) ? $data[$val->lrr]['value'] + 1 : 1,
                     ];
                 } else {
                     continue;
@@ -245,9 +254,14 @@ class ApiService{
             }
         }
 
-        $cmf_arr = array_column($data, 'count');
-        array_multisort($cmf_arr, SORT_DESC, $data);
-        $result['data'] = $data;
+        $data_arr = array_column($data, 'count');
+        array_multisort($data_arr, SORT_DESC, $data);
+
+        $pie_arr = array_column($pie, 'value');
+        array_multisort($pie_arr, SORT_DESC, $pie);
+
+        $result['data']['list'] = $data;
+        $result['data']['pie']  = $pie;
 
         return $result;
     }