Bläddra i källkod

全流程巡检接口

任敬轩 4 månader sedan
förälder
incheckning
b604cde357
1 ändrade filer med 20 tillägg och 9 borttagningar
  1. 20 9
      Modules/Camera/Http/Controllers/Api/CameraApiController.php

+ 20 - 9
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -3056,15 +3056,26 @@ class CameraApiController extends BaseController
             $risk_type_dict[$risk_type_key] = $risk_type_name;
         }
 
-        // 风险数据 is_delete = 0 and delete_type = 0 and flow_id is not null
-        $risk_list = DB::connection('mysql_fwe10')
-            ->table('uf_xx_risk_assignment as t')
-            ->select('t.*','t1.shr as coal_shr')
-            ->whereDate('t.create_time', $date)
-            ->where('t.is_delete',0)
-            ->where('t.delete_type',0)
-            ->where('t.current_step','结束节点')
-            ->whereNotNull('t.flow_id');
+        if(!empty($area_id)){
+            // 风险数据 is_delete = 0 and delete_type = 0 and flow_id is not null
+            $risk_list = DB::connection('mysql_fwe10')
+                ->table('uf_xx_risk_assignment as t')
+                ->select('t.*','t1.shr as coal_shr')
+                ->whereDate('t.create_time', $date)
+                ->where('t.is_delete',0)
+                ->where('t.delete_type',0)
+                ->where('t.current_step','结束节点')
+                ->whereNotNull('t.flow_id');
+        }else{
+            // 风险数据 is_delete = 0 and delete_type = 0 and flow_id is not null
+            $risk_list = DB::connection('mysql_fwe10')
+                ->table('uf_xx_risk_assignment as t')
+                ->whereDate('t.create_time', $date)
+                ->where('t.is_delete',0)
+                ->where('t.delete_type',0)
+                ->where('t.current_step','结束节点')
+                ->whereNotNull('t.flow_id');
+        }
 
         if (!empty($coal_washery_id)) $risk_list->where('t.coal_washery_id', $coal_washery_id); // 筛选洗煤厂
         if (!empty($area_id)) {