Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

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

@@ -4,18 +4,80 @@ namespace Modules\Admin\Http\Controllers\Api;
 
 use App\Enum\ApiEnum;
 use App\Http\Controllers\Api\BaseController;
-//use Illuminate\Http\Request;
-//use Illuminate\Support\Facades\DB;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 //use Illuminate\Support\Facades\Log;
 //use Symfony\Component\HttpFoundation\Response;
 
 class ReportController extends BaseController
 {
-    public function testApi()
-    {
+    public function testApi() {
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
         $result['code']    = "200";
         return self::successResponse($result);
     }
 
+    public function workList(Request $request): array
+    {
+
+        $date = $request->query('date', date('Y-m-d'));
+
+        $data_list = DB::connection('mysql_fwe10')
+            ->table('uf_jxwwzyqd as t')
+            ->whereDate('t.zyrq', $date)
+            ->where('t.is_delete',0)
+            ->where('t.delete_type',0)
+            ->get();
+
+        $total = count($data_list);
+
+        $total_gao = 0;
+        $total_zhong = 0;
+        $total_di = 0;
+
+
+        $total_ww = 0;
+        $ww_gao = 0;
+        $ww_zhong = 0;
+        $ww_di = 0;
+
+
+        $type_num = [0,0,0,0];
+
+        foreach ($data_list as $value) {
+            if ($value->fxdj == 0) {
+                $total_gao++;
+            }elseif ($value->fxdj == 1) {
+                $total_zhong++;
+            }elseif ($value->fxdj == 2) {
+                $total_di++;
+            }
+            if ($value->zylb == 1) {
+                $total_ww++;
+                if ($value->fxdj == 0) {
+                    $ww_gao++;
+                }elseif ($value->fxdj == 1) {
+                    $ww_zhong++;
+                }elseif ($value->fxdj == 2) {
+                    $ww_di++;
+                }
+            }
+            if ($value->zylx == 0) {
+                $type_num[0]++;
+            }elseif ($value->zylx == 1) {
+                $type_num[1]++;
+            }elseif ($value->zylx == 2) {
+                $type_num[2]++;
+            }elseif ($value->zylx == 3) {
+                $type_num[3]++;
+            }
+        }
+
+        $result["risk_info"] = "简况：检修作业".$total."项。其中：高度".$total_gao."项、中度".$total_zhong."项、低度".$total_di."项；委外作业共".$total_ww."项(其中：高度".$ww_gao."项、中度".$ww_zhong."项、低度".$ww_di."项）；\n特级动火作业".$type_num[0]."处，一级动火作业".$type_num[1]."处，有限空间作业".$type_num[2]."处，高处作业".$type_num[3]."处。";
+
+        return $result;
+
+
+    }
+
 }

Modules/Admin/Routes/api.php

@@ -118,6 +118,8 @@ Route::namespace('Api')->group(function () {
     Route::post('gggs/sum_table/duty','ApiController@sumTableDuty');
     //公管公司总表火车进煤情况
     Route::post('gggs/sum_table/train_enter_coal','ApiController@trainEnterCoal');
-    //公关公司报表
+    //公管公司报表
     Route::post('gggs/testApi','ReportController@testApi');
+    //公管公司-风险作业报表
+    Route::post('gggs/work_list','ReportController@workList');
 });