调整缴费单列表不同类型缴费单 统一按照电表ID去查询电表，站名基础信息

application/em/controller/Payment.php

@@ -172,7 +172,9 @@ class Payment extends Base
         //过滤不可以生成缴费单的账单ID
         $idsArr = [];
         $amount = 0;
+        $inv0 = null;
         foreach ($invs as $inv){
+            if($inv0 === null) $inv0 = $inv;
             //未生成缴费或已挂起
             $amount += $inv->payment_balance;
             //是否已挂起
@@ -219,8 +221,8 @@ class Payment extends Base
         $pData  = [];
         $pData['payment_id'] = $paymentId;
         $pData['status'] = 1;
-        $pData['account_id'] = '\\';  //占位符，表示空的无效的
-        $pData['em_id'] = '\\';    //占位符，表示空的无效的
+        $pData['account_id'] = $inv0->account_id;  //占位符，表示空的无效的
+        $pData['em_id'] = $inv0->em_id;    //占位符，表示空的无效的
         $pData['payment_type'] = 1;
         $pData['balance'] = $pData['amount'] = round($amount,2);
         $pData['uid'] = $this->uid;

application/em/model/EmPayment.php

@@ -23,46 +23,19 @@ class EmPayment extends Base
     //缴费单+search
     public function getPaymentList($map,$Nowpage,$limits){
 
-        //先找到账单
-        $data = self::alias('pay')
-            ->field('pay.*')
-            ->field('epi.invoice_id')
-            ->field('em.em_numb')
-            ->field('r.region_name,station.station_name')
-            ->leftJoin(['em_payment_invoice'=>'epi'],'epi.payment_id = pay.payment_id')
-            ->leftJoin(['em_invoice'=>'ei'],'ei.invoice_id=epi.invoice_id')
-            ->leftJoin(['em_account'=>'ea'],'ea.account_id=ei.account_id')
-            ->leftJoin(['em'],'em.id=ea.em_id')
+
+        $data = self::alias('p')
+            ->field('p.*')
+            ->field('em.em_numb,r.region_name,station.station_name')
+            ->leftJoin(['em'],'em.id=p.em_id')
             ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
             ->leftJoin(['region'=>'r'],'station.area_id = r.id')
             ->where($map)
             ->order('pay.id desc')
-            ->group('pay.payment_id')
             ->page($Nowpage, $limits)
             ->select()
             ->toarray();
 
-//        $arr = [];
-//        foreach ($data as $v){
-//            $arr[] = $v['payment_id'];
-//        }
-//
-//        $data2 = self::alias('pay')
-//            ->field('pay.*')
-//            ->field('em.em_numb,r.region_name,station.station_name')
-//            ->leftJoin(['em_account'=>'ea'],'ea.account_id=pay.account_id')
-//            ->leftJoin(['em'],'em.id=ea.em_id')
-//            ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
-//            ->leftJoin(['region'=>'r'],'station.area_id = r.id')
-//            ->where($map)
-//            ->whereNotIn('pay.payment_id',$arr)
-//            ->order('pay.id desc')
-//            ->group('pay.payment_id')
-//            ->page($Nowpage, $limits)
-//            ->select()
-//            ->toarray();
-//
-//        $data = array_merge($data,$data2);
 
         $sortKey = [];
         foreach ($data as $k=>$item){