|
|
@@ -1131,6 +1131,15 @@ class Facility extends Api
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
$data = [];
|
|
|
+ if ($param['start'] === ''){
|
|
|
+ if (date('Y-m-d H:i:s')>date('Y-m-d 08:30:00',time()) && date('Y-m-d H:i:s')<date('Y-m-d 20:30:00',time())){
|
|
|
+ $param['start'] = date('Y-m-d 08:30:00',time());
|
|
|
+ }elseif (date('Y-m-d H:i:s')>date('Y-m-d 20:30:00',time()) && date('Y-m-d H:i:s')<date('Y-m-d 23:59:59',time())){
|
|
|
+ $param['start'] = date('Y-m-d 20:30:00',time());
|
|
|
+ }else{
|
|
|
+ $param['start'] = date('Y-m-d 20:30:00',time()-86400);
|
|
|
+ }
|
|
|
+ }
|
|
|
$machineDetail = \db('设备_产量采集')
|
|
|
->alias('a')
|
|
|
->join('设备_基本资料 b','a.设备编号 = b.设备编号')
|