调整账单查询条件

application/em/controller/Invoice.php

@@ -60,9 +60,9 @@ class Invoice extends Base
         $page =Request::param('page')?Request::param('page'):1;
         $limit = Request::param('limit')?Request::param('limit'):10;
         $data = (new EmInvoice)->getInvoiceList($map,$page,$limit);
-        foreach ( $data as $key => &$v) {
-            $v['status']=parseStatus($v['status']);
-        }
+//        foreach ( $data as $key => &$v) {
+//            $v['status']=parseStatus($v['status']);
+//        }
         $InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
         if(Request::param('page')){
             return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];

application/em/model/EmInvoice.php

@@ -69,10 +69,9 @@ class EmInvoice extends Base
             ->field('inv.*')
             ->field('station.station_name')
             ->field('em.em_numb')
-            ->leftJoin(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id')
-            ->leftJoin(['em_useage'=>'eu'],'eu.useage_id = eiu.useage_id')
-            ->leftJoin(['em'],'em.id=eu.em_id')
-            ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
+            ->join(['em_account'=>'ea'],'ea.account_id = inv.account_id')
+            ->join(['em'],'em.id=ea.em_id')
+            ->join(['station_info'=>'station'],'station.station_id=em.station_id')
             ->where(['inv.invoice_id'=>$ids])
 //            ->where('inv.payment_balance','neq',0)
             ->select();