添加网格化接口

Modules/Admin/Services/ApiService.php

@@ -193,67 +193,30 @@ class ApiService{
         $data = [];
         $pie  = [];
         foreach ($query as $key => $val) {
-            if ($depart == 'all') {
-//                $wghgl = DB::connection('mysql_fwview')->table('uf_wghgl_new')
-//                           ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
-//                           ->where('lrr', $val->lrr)
-//                           ->groupBy('xjdw')
-//                           ->select('xjdw')
-//                           ->get();
+            $allcount = DB::connection('mysql_fwview')->table('formtable_main_974')
+                          ->where('szxmc', $depart)->count();
+
+            $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
+                        ->where('xjdw', $depart)
+                        ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
+                        ->where('lrr', $val->lrr)->count();
 
+            if ($detail >= $allcount) {
                 $lastname = DB::connection('mysql_fwview')->table('hrmresource')
                               ->where('id', $val->lrr)->value('lastname');
 
-//                foreach ($wghgl as $k => $v) {
-                    $allcount = DB::connection('mysql_fwview')->table('formtable_main_974')
-                                  ->where('szxmc', $val->xjdw)->count();
-
-                    $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
-                                ->where('xjdw', $val->xjdw)
-                                ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
-                                ->where('lrr', $val->lrr)->count();
-
-                    if ($detail >= $allcount) {
-                        $data[$val->lrr] = [
-                            'department' => $val->dwmc,
-                            'lastname'   => $lastname,
-                            'person_id'  => $val->lrr,
-                            '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;
-                    }
-//                }
+                $data[$val->lrr] = [
+                    'department' => $val->dwmc,
+                    'lastname'   => $lastname,
+                    'person_id'  => $val->lrr,
+                    '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 {
-                $allcount = DB::connection('mysql_fwview')->table('formtable_main_974')
-                              ->where('szxmc', $depart)->count();
-
-                $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
-                            ->where('xjdw', $depart)
-                            ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
-                            ->where('lrr', $val->lrr)->count();
-
-                if ($detail >= $allcount) {
-                    $lastname = DB::connection('mysql_fwview')->table('hrmresource')
-                                  ->where('id', $val->lrr)->value('lastname');
-
-                    $data[$val->lrr] = [
-                        'department' => $val->dwmc,
-                        'lastname'   => $lastname,
-                        'person_id'  => $val->lrr,
-                        '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;
-                }
+                continue;
             }
         }