|
@@ -3409,7 +3409,7 @@ class CameraApiController extends BaseController
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$coal_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery as t')
|
|
$coal_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery as t')
|
|
|
- ->select('t.*','uf_xx_area.title as area_title')
|
|
|
|
|
|
|
+ ->select('t.*','t1.title as area_title')
|
|
|
->leftJoin('uf_xx_area as t1','t1.id','=','t.area_id')
|
|
->leftJoin('uf_xx_area as t1','t1.id','=','t.area_id')
|
|
|
->where('t.is_delete',0)
|
|
->where('t.is_delete',0)
|
|
|
->orderBy('t1.create_time')
|
|
->orderBy('t1.create_time')
|
|
@@ -3885,7 +3885,7 @@ class CameraApiController extends BaseController
|
|
|
->where('is_delete',0)
|
|
->where('is_delete',0)
|
|
|
->where('current_step','结束节点')
|
|
->where('current_step','结束节点')
|
|
|
->where('delete_type',0)
|
|
->where('delete_type',0)
|
|
|
- ->whereNotNull('t.flow_id')
|
|
|
|
|
|
|
+ ->whereNotNull('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){
|
