|
...
|
...
|
@@ -34,11 +34,11 @@ class AdminOrderController extends AdminBaseController{ |
|
|
|
$data=$Order->alias('a')
|
|
|
|
->field('a.*,b.serial_number,b.hospital')
|
|
|
|
->join('equipment b','a.mac_address=b.mac_address')
|
|
|
|
->paginate(10)->items(function ($item){
|
|
|
|
->paginate(10)->each(function ($item){
|
|
|
|
$item['time']=($item['end_time']-$item['start_time'])/3600;
|
|
|
|
return $item;
|
|
|
|
});
|
|
|
|
|
|
|
|
dump($data->toArray());
|
|
|
|
$this->assign('data',$data);
|
|
|
|
return $this->fetch();
|
|
|
|
}
|
...
|
...
|
|
