|
@@ -3335,7 +3335,7 @@ class CameraApiController extends BaseController
|
|
|
->where('risk_type',$i)
|
|
->where('risk_type',$i)
|
|
|
->where('is_delete',0)
|
|
->where('is_delete',0)
|
|
|
->where('delete_type',0)
|
|
->where('delete_type',0)
|
|
|
- ->where('t.current_step','结束节点')
|
|
|
|
|
|
|
+ ->where('current_step','结束节点')
|
|
|
->whereNotNull('flow_id')
|
|
->whereNotNull('flow_id')
|
|
|
->orderBy('create_time')->get();
|
|
->orderBy('create_time')->get();
|
|
|
$risk_zhong_list = DB::connection('mysql_fwe10')
|
|
$risk_zhong_list = DB::connection('mysql_fwe10')
|
|
@@ -3345,7 +3345,7 @@ class CameraApiController extends BaseController
|
|
|
->where('coal_washery_id',$coal_list[$j]->ID)
|
|
->where('coal_washery_id',$coal_list[$j]->ID)
|
|
|
->where('risk_type',$i)
|
|
->where('risk_type',$i)
|
|
|
->where('is_delete',0)
|
|
->where('is_delete',0)
|
|
|
- ->where('t.current_step','结束节点')
|
|
|
|
|
|
|
+ ->where('current_step','结束节点')
|
|
|
->where('delete_type',0)
|
|
->where('delete_type',0)
|
|
|
->whereNotNull('flow_id')
|
|
->whereNotNull('flow_id')
|
|
|
->orderBy('create_time')->get();
|
|
->orderBy('create_time')->get();
|
|
@@ -3424,7 +3424,7 @@ class CameraApiController extends BaseController
|
|
|
->table('uf_xx_risk_assignment as t')
|
|
->table('uf_xx_risk_assignment as t')
|
|
|
->where('risk_level',2)
|
|
->where('risk_level',2)
|
|
|
->whereDate('create_time', $date)
|
|
->whereDate('create_time', $date)
|
|
|
- ->where('IS_DELETE', 0)
|
|
|
|
|
|
|
+ ->where('t.is_delete', 0)
|
|
|
->where('t.current_step','结束节点')
|
|
->where('t.current_step','结束节点')
|
|
|
->where('t.delete_type',0)
|
|
->where('t.delete_type',0)
|
|
|
->whereNotNull('flow_id')
|
|
->whereNotNull('flow_id')
|
