|
|
@@ -3436,8 +3436,6 @@ class CameraApiController extends BaseController
|
|
|
->leftJoin('uf_xx_area as area','area.id','=','coal.area_id')
|
|
|
->where('risk.is_delete',0)
|
|
|
->where('risk.delete_type',0)
|
|
|
- ->where('risk.wwdw',null)
|
|
|
- ->where('risk.sgdd',null)
|
|
|
->whereDate('risk.create_time', $date)
|
|
|
// ->whereIn('risk.risk_level',[0,1])
|
|
|
->where('risk.current_step','结束节点')
|
|
|
@@ -3675,8 +3673,6 @@ class CameraApiController extends BaseController
|
|
|
->where('t.is_delete', 0)
|
|
|
->where('t.current_step','结束节点')
|
|
|
->where('t.delete_type',0)
|
|
|
- ->where('t.wwdw',null)
|
|
|
- ->where('t.sgdd',null)
|
|
|
->whereNotNull('flow_id')
|
|
|
->where('move_camera','!=',null)
|
|
|
->orderBy('create_time')->get();
|
|
|
@@ -3764,8 +3760,6 @@ class CameraApiController extends BaseController
|
|
|
->where('t.wcqk',0)
|
|
|
->where('t.is_delete',0)
|
|
|
->where('t.delete_type',0)
|
|
|
- ->where('t.wwdw',null)
|
|
|
- ->where('t.sgdd',null)
|
|
|
->where('t.current_step','结束节点')
|
|
|
->whereNotNull('t.flow_id')
|
|
|
->get();
|
|
|
@@ -3893,8 +3887,6 @@ class CameraApiController extends BaseController
|
|
|
->where('wcqk',0)
|
|
|
->where('t.is_delete',0)
|
|
|
->where('t.delete_type',0)
|
|
|
- ->where('t.wwdw',null)
|
|
|
- ->where('t.sgdd',null)
|
|
|
->where('t.current_step','结束节点')
|
|
|
->whereNotNull('t.flow_id')
|
|
|
->orderBy('create_time')->get();
|
|
|
@@ -3990,8 +3982,6 @@ class CameraApiController extends BaseController
|
|
|
->where('wcqk',0)
|
|
|
->where('t.is_delete',0)
|
|
|
->where('t.delete_type',0)
|
|
|
- ->where('t.wwdw',null)
|
|
|
- ->where('t.sgdd',null)
|
|
|
->where('t.current_step','结束节点')
|
|
|
->whereNotNull('t.flow_id')
|
|
|
->orderBy('create_time')->get();
|
|
|
@@ -4079,8 +4069,6 @@ class CameraApiController extends BaseController
|
|
|
->whereBetween('t.create_time', [$start_time, $end_time])
|
|
|
->where('t.is_delete',0)
|
|
|
->where('t.delete_type',0)
|
|
|
- ->where('t.wwdw',null)
|
|
|
- ->where('t.sgdd',null)
|
|
|
->where('t.current_step','结束节点')
|
|
|
->whereNotNull('t.flow_id')
|
|
|
->orderBy('t1.sort')
|
|
|
@@ -4213,8 +4201,6 @@ class CameraApiController extends BaseController
|
|
|
$risk_list = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')
|
|
|
->whereBetween('create_time', [$start_time, $end_time])
|
|
|
->where('is_delete',0)
|
|
|
- ->where('wwdw',null)
|
|
|
- ->where('sgdd',null)
|
|
|
->where('current_step','结束节点')
|
|
|
->where('delete_type',0)
|
|
|
->whereNotNull('flow_id')
|
