修复账单列表无法显示与账单详情显示错误

application/em/model/EmInvoice.php

@@ -32,17 +32,15 @@ class EmInvoice extends Base
     public function getInvoiceList($map,$Nowpage,$limits){
         $data = self::alias('inv')
             ->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')
+            ->field('station.station_name,em.em_numb')
+            ->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($map)
             ->page($Nowpage, $limits)
             ->select()
             ->toarray();
-         foreach ($data as &$item){
+          foreach ($data as &$item){
              if($item['payment_balance'] == '') $item['payment_balance'] = 0;
             $item['paid_amount'] = $item['payment_amount'] - $item['payment_balance'];
             if(is_int($item['settle_amount']) && $item['settle_balance']){
@@ -56,15 +54,12 @@ class EmInvoice extends Base
     }
     public function getInvoiceCount($map){
         $data = self::alias('inv')
-            ->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')
-            ->where($map)
-            ->count();
+                ->field('inv.*')
+                ->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($map)
+                ->count();
         return $data;
     }
     //通过invoice_id查询列表数据
@@ -73,10 +68,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();
@@ -94,7 +88,14 @@ class EmInvoice extends Base
         $eiu = EmInvoiceUseage::where(['invoice_id'=>$inv->invoice_id])->find();
 
         //查询抄表信息
-        $useage = Useage::with('photo')->get(['useage_id'=>$eiu->useage_id]);
+        $useage = Useage::get(['useage_id'=>$eiu->useage_id]);
+
+        if($useage->photo_id) {
+            $receipt = Receipt::get(['id'=>$useage->photo_id]);
+            if($receipt) $useage['photo'] = $receipt;
+        } else {
+            $useage['photo'] = [];
+        }
 
         //获取电表信息
         $em = Em::with('rule')->field('id,station_id,em_numb,em_type_id,rate')->where(['id'=>$useage->em_id])->find();
@@ -125,10 +126,10 @@ class EmInvoice extends Base
 
         //峰谷表
         if($inv['type'] !== 5){
-            $ud = UseageDetail::field('*,case type 
-                            when 1 then "尖峰段" 
+            $ud = UseageDetail::field('*,case type
+                            when 1 then "尖峰段"
                             when 2 then "峰段"
-                            when 3 then "谷段" 
+                            when 3 then "谷段"
                             when 4 then "平段"
                             else "普通" end as typeName
                             ')
@@ -143,7 +144,7 @@ class EmInvoice extends Base
             $totle['current_numb'] = 0;
             $totle['repo_numb'] = 0;
             $totle['amount'] = $totle['settle_amount'] = 0;
-            $totle['settle_price'] = $inv->em->emr->settle_price * $inv->em->rate;
+            $totle['settle_price'] = ($inv->em->emr->settle_price?:0) * $inv->em->rate;
             $totle['settle_status'] = parseStatus($inv->status,2);
 
              //峰谷表与普通抄表