|
|
@@ -514,7 +514,7 @@ class ReportingWork extends Api
|
|
|
if ($start < date('Y-m-d H:15:00', time())) {
|
|
|
$start = date('Y-m-d H:00:00', time());
|
|
|
} elseif ($start > date('Y-m-d H:45:00', time())) {
|
|
|
- $start = date('Y-m-d H+1:00:00', time());
|
|
|
+ $start = date('Y-m-d H:00:00', time());
|
|
|
} else {
|
|
|
$start = date('Y-m-d H:30:00', time());
|
|
|
}
|
|
|
@@ -540,6 +540,7 @@ class ReportingWork extends Api
|
|
|
];
|
|
|
array_push($data,$workTime);
|
|
|
}
|
|
|
+ halt($data);
|
|
|
foreach ($data as $key=>$value){
|
|
|
unset($value['id']);
|
|
|
$sql = \db('工单_工艺资料')
|