|
|
@@ -3594,10 +3594,12 @@ class CameraApiController extends BaseController
|
|
|
public function export4(Request $request){
|
|
|
$params = $request->all();
|
|
|
|
|
|
- if(isset($params['date'])){
|
|
|
- $date = $params['date'];
|
|
|
+ if(isset($params['start_time']) && isset($params['end_time'])){
|
|
|
+ $start_time = $params['start_time'];
|
|
|
+ $end_time = $params['end_time'];
|
|
|
}else{
|
|
|
- $date = date('Y-m-d');
|
|
|
+ $start_time = date('Y-m-d 00:00:00');
|
|
|
+ $end_time = date('Y-m-d 00:00:00', strtotime('+1 day'));
|
|
|
}
|
|
|
|
|
|
$result = [];
|
|
|
@@ -3607,7 +3609,7 @@ class CameraApiController extends BaseController
|
|
|
->select('t.*','t2.title as area','t1.title','t1.sort')
|
|
|
->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)
|
|
|
+ ->whereBetween('t.create_time', [$start_time, $end_time])
|
|
|
->where('t.is_delete',0)
|
|
|
->where('t.delete_type',0)
|
|
|
->whereNotNull('t.flow_id')
|
|
|
@@ -3621,7 +3623,7 @@ class CameraApiController extends BaseController
|
|
|
for($j=0;$j<count($people);$j++){
|
|
|
$result[$index]['area'] = $risk_data[$i]->area;
|
|
|
$result[$index]['unit'] = $risk_data[$i]->title;
|
|
|
- $work_num = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time',$date)->where('is_delete',0)->where('delete_type',0)->whereNotNull('flow_id')->where('coal_washery_id',$risk_data[$i]->coal_washery_id)->count();
|
|
|
+ $work_num = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereBetween('create_time', [$start_time, $end_time])->where('is_delete',0)->where('delete_type',0)->whereNotNull('flow_id')->where('coal_washery_id',$risk_data[$i]->coal_washery_id)->count();
|
|
|
$result[$index]['work_num'] = $work_num;
|
|
|
$result[$index]['work_people'] = $people[$j];
|
|
|
$result[$index]['control_num'] = 1;
|
|
|
@@ -3632,7 +3634,8 @@ class CameraApiController extends BaseController
|
|
|
}else{//单人
|
|
|
$result[$index]['area'] = $risk_data[$i]->area;
|
|
|
$result[$index]['unit'] = $risk_data[$i]->title;
|
|
|
- $work_num = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereDate('create_time',$date)->where('is_delete',0)->where('delete_type',0)->whereNotNull('flow_id')->where('coal_washery_id',$risk_data[$i]->coal_washery_id)->count();
|
|
|
+
|
|
|
+ $work_num = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')->whereBetween('create_time', [$start_time, $end_time])->where('is_delete',0)->where('delete_type',0)->whereNotNull('flow_id')->where('coal_washery_id',$risk_data[$i]->coal_washery_id)->count();
|
|
|
$result[$index]['work_num'] = $work_num;
|
|
|
$result[$index]['work_people'] = $risk_data[$i]->work_people;
|
|
|
$result[$index]['control_num'] = 1;
|
|
|
@@ -3683,7 +3686,9 @@ class CameraApiController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- return $result;
|
|
|
+ $res['control_list'] = $result;
|
|
|
+
|
|
|
+ return $res;
|
|
|
}
|
|
|
|
|
|
//图片上传
|
