|
@@ -3033,7 +3033,7 @@ class CameraApiController extends BaseController
|
|
->whereDate('t.create_time', $date)
|
|
->whereDate('t.create_time', $date)
|
|
->where('t.is_delete',0)
|
|
->where('t.is_delete',0)
|
|
->where('t.delete_type',0)
|
|
->where('t.delete_type',0)
|
|
- ->where('current_step','结束节点')
|
|
|
|
|
|
+ ->where('t.current_step','结束节点')
|
|
->whereNotNull('t.flow_id');
|
|
->whereNotNull('t.flow_id');
|
|
|
|
|
|
if (!empty($coal_washery_id)) $risk_list->where('t.coal_washery_id', $coal_washery_id); // 筛选洗煤厂
|
|
if (!empty($coal_washery_id)) $risk_list->where('t.coal_washery_id', $coal_washery_id); // 筛选洗煤厂
|
|
@@ -3335,6 +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','结束节点')
|
|
->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')
|
|
@@ -3344,6 +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('delete_type',0)
|
|
->where('delete_type',0)
|
|
->whereNotNull('flow_id')
|
|
->whereNotNull('flow_id')
|
|
->orderBy('create_time')->get();
|
|
->orderBy('create_time')->get();
|
|
@@ -3423,6 +3425,7 @@ class CameraApiController extends BaseController
|
|
->where('risk_level',2)
|
|
->where('risk_level',2)
|
|
->whereDate('create_time', $date)
|
|
->whereDate('create_time', $date)
|
|
->where('IS_DELETE', 0)
|
|
->where('IS_DELETE', 0)
|
|
|
|
+ ->where('t.current_step','结束节点')
|
|
->where('t.delete_type',0)
|
|
->where('t.delete_type',0)
|
|
->whereNotNull('flow_id')
|
|
->whereNotNull('flow_id')
|
|
->where('move_camera','!=',null)
|
|
->where('move_camera','!=',null)
|
|
@@ -3477,6 +3480,7 @@ class CameraApiController extends BaseController
|
|
->where('t.wcqk',0)
|
|
->where('t.wcqk',0)
|
|
->where('t.is_delete',0)
|
|
->where('t.is_delete',0)
|
|
->where('t.delete_type',0)
|
|
->where('t.delete_type',0)
|
|
|
|
+ ->where('t.current_step','结束节点')
|
|
->whereNotNull('t.flow_id')
|
|
->whereNotNull('t.flow_id')
|
|
->get();
|
|
->get();
|
|
|
|
|
|
@@ -3580,6 +3584,7 @@ class CameraApiController extends BaseController
|
|
->where('wcqk',0)
|
|
->where('wcqk',0)
|
|
->where('t.is_delete',0)
|
|
->where('t.is_delete',0)
|
|
->where('t.delete_type',0)
|
|
->where('t.delete_type',0)
|
|
|
|
+ ->where('t.current_step','结束节点')
|
|
->whereNotNull('t.flow_id')
|
|
->whereNotNull('t.flow_id')
|
|
->orderBy('create_time')->get();
|
|
->orderBy('create_time')->get();
|
|
|
|
|
|
@@ -3683,6 +3688,7 @@ class CameraApiController extends BaseController
|
|
->where('wcqk',0)
|
|
->where('wcqk',0)
|
|
->where('t.is_delete',0)
|
|
->where('t.is_delete',0)
|
|
->where('t.delete_type',0)
|
|
->where('t.delete_type',0)
|
|
|
|
+ ->where('t.current_step','结束节点')
|
|
->whereNotNull('t.flow_id')
|
|
->whereNotNull('t.flow_id')
|
|
->orderBy('create_time')->get();
|
|
->orderBy('create_time')->get();
|
|
|
|
|
|
@@ -3769,6 +3775,7 @@ class CameraApiController extends BaseController
|
|
->whereBetween('t.create_time', [$start_time, $end_time])
|
|
->whereBetween('t.create_time', [$start_time, $end_time])
|
|
->where('t.is_delete',0)
|
|
->where('t.is_delete',0)
|
|
->where('t.delete_type',0)
|
|
->where('t.delete_type',0)
|
|
|
|
+ ->where('t.current_step','结束节点')
|
|
->whereNotNull('t.flow_id')
|
|
->whereNotNull('t.flow_id')
|
|
->orderBy('t1.sort')
|
|
->orderBy('t1.sort')
|
|
->get();
|
|
->get();
|
|
@@ -3876,6 +3883,9 @@ class CameraApiController extends BaseController
|
|
$risk_list = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')
|
|
$risk_list = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')
|
|
->whereBetween('create_time', [$start_time, $end_time])
|
|
->whereBetween('create_time', [$start_time, $end_time])
|
|
->where('is_delete',0)
|
|
->where('is_delete',0)
|
|
|
|
+ ->where('current_step','结束节点')
|
|
|
|
+ ->where('delete_type',0)
|
|
|
|
+ ->whereNotNull('t.flow_id')
|
|
->where('coal_washery_id',$coal_list[$i]->ID)
|
|
->where('coal_washery_id',$coal_list[$i]->ID)
|
|
->get();
|
|
->get();
|
|
if(count($risk_list) > 0){
|
|
if(count($risk_list) > 0){
|