export1接口新加洗煤厂筛选

Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -2908,11 +2908,9 @@ class CameraApiController extends BaseController
     public function export1(Request $request){
         $params = $request->all();
 
-        if(isset($params['date'])){
-            $date = $params['date'];
-        }else{
-            $date = date('Y-m-d');
-        }
+        $date = $request->query('date', date('Y-m-d'));
+        $coal_washery_id = $request->query('coal_washery_id');
+
 
         $classes = ['早班','中班','夜班'];
         $risk_desc = ['高风险','中风险','低风险'];
@@ -2929,8 +2927,11 @@ class CameraApiController extends BaseController
         // 风险数据
         $risk_list = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time', $date)->where('is_delete',0)->get();
         // 洗煤厂数据
-        $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('is_delete',0)->orderBy('sort')->get();
+//        $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('is_delete',0)->orderBy('sort')->get();
 
+        $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery')->where('is_delete',0);
+        if (!empty($coal_washery_id)) $coal_washery_list->where('id', $coal_washery_id);
+        $coal_washery_list = $coal_washery_list->orderBy('sort')->get();
 
         $coal_washery_dict = [];
         $coal_washery_type_dict = [];
@@ -2981,7 +2982,7 @@ class CameraApiController extends BaseController
 
             // 洗煤厂类型统计（委外、自营）
             $col_washery_id = $value->coal_washery_id;
-            $col_washery_type = $coal_washery_dict[$col_washery_id]->obj_type;
+            $col_washery_type = $coal_washery_dict[$col_washery_id]->obj_type ?? "<请检查洗煤厂是否已被删除！>";
             if($col_washery_type == 0) {
                 $res['ziying']++;
             } else if ($col_washery_type == 1) {