|
|
@@ -3698,7 +3698,7 @@ class CameraApiController extends BaseController
|
|
|
->select('t.*','t2.title')
|
|
|
->leftJoin('uf_xx_coal_washery as t1', 't.coal_washery_id', '=', 't1.id')
|
|
|
->leftJoin('uf_xx_area as t2', 't1.area_id', '=', 't2.id')
|
|
|
- ->whereDate('t.create_time', $date)
|
|
|
+ ->whereDate('t.fill_date', $date)
|
|
|
->where('t.is_delete',0)
|
|
|
->where('t.wcqk',0)
|
|
|
->where('t.is_delete',0)
|
|
|
@@ -3824,7 +3824,7 @@ class CameraApiController extends BaseController
|
|
|
for($i=0;$i<count($coal_list);$i++){
|
|
|
$risk_list = DB::connection('mysql_fwe10')
|
|
|
->table('uf_xx_risk_assignment as t')
|
|
|
- ->whereDate('create_time', $date)
|
|
|
+ ->whereDate('fill_date', $date)
|
|
|
->where('IS_DELETE', 0)
|
|
|
->where('coal_washery_id',$coal_list[$i]->ID)
|
|
|
->where('wcqk',0)
|
|
|
@@ -3913,14 +3913,13 @@ class CameraApiController extends BaseController
|
|
|
->where('obj_type',1)
|
|
|
->where('t.is_delete',0)
|
|
|
->where('t.delete_type',0)
|
|
|
- ->whereNotNull('t.flow_id')
|
|
|
->orderBy('sort')->get();
|
|
|
|
|
|
if(count($coal_list) > 0){
|
|
|
for($i=0;$i<count($coal_list);$i++){
|
|
|
$risk_list = DB::connection('mysql_fwe10')
|
|
|
->table('uf_xx_risk_assignment as t')
|
|
|
- ->whereDate('create_time', $date)
|
|
|
+ ->whereDate('fill_date', $date)
|
|
|
->where('IS_DELETE', 0)
|
|
|
->where('coal_washery_id',$coal_list[$i]->ID)
|
|
|
->where('wcqk',0)
|
