order

@@ -29,7 +29,12 @@ class AdminAllStatisticsController extends AdminBaseController{
 
 
     public function index(){
     public function index(){
         $Order=new OrderModel();
         $Order=new OrderModel();
-        $data=$Order->paginate(10);
+        $data=$Order->alias('a')
+            ->field('a.*,b.serial_number,b.hospital,sum() as sumTime')
+            ->join('equipment b','a.mac_address=b.mac_address')
+            ->group('mac_address')
+            ->order('start_time','desc')
+            ->paginate(10);
         $this->assign('data',$data);
         $this->assign('data',$data);
         return $this->fetch();
         return $this->fetch();
     }
     }

@@ -49,7 +49,7 @@ class AdminOrderController extends AdminBaseController{
             ->where($where)
             ->where($where)
             ->order('start_time','desc')
             ->order('start_time','desc')
             ->paginate(10)->each(function ($item){
             ->paginate(10)->each(function ($item){
-                $item['time']=($item['end_time']-$item['start_time'])/3600;
+                $item['time']=($item['end_time']-$item['start_time']);
                 return $item;
                 return $item;
             });
             });
         $this->assign('data',$data);
         $this->assign('data',$data);