From 9cb0e335313c4541913248d62040a93ddf16a7b0 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 7 Jul 2020 10:30:37 +0800
Subject: [PATCH] znac

---
 .../ExcelPaymentController.class.php          | 59 ++++++++++---------
 .../Payment/View/ExcelPayment/lists.html      |  4 ++
 .../Payment/View/ExcelPayment/viewPuPool.html |  1 +
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/Application/Payment/Controller/ExcelPaymentController.class.php b/Application/Payment/Controller/ExcelPaymentController.class.php
index fe7b7f85b..75ff1694f 100644
--- a/Application/Payment/Controller/ExcelPaymentController.class.php
+++ b/Application/Payment/Controller/ExcelPaymentController.class.php
@@ -71,6 +71,10 @@ class ExcelPaymentController extends BaseController
         if(isset($_REQUEST['pay_status'])){
             $map['i.pay_status'] = $_REQUEST['pay_status'];
         }
+        if(isset($_REQUEST['batch_num'])){
+            $map['i.batch_num'] = $_REQUEST['batch_num'];
+        }
+        
 
         $CompanyInfo = M("excel_statement_info","tab_")
                       ->alias('i')
@@ -162,19 +166,10 @@ class ExcelPaymentController extends BaseController
             $is_export = true;
         }
         //获取基本信息
-        $dbres =  M("company_statement_info","tab_")->where("id='{$id}'")->select();
+        $dbres =  M("ExcelStatementInfo","tab_")->where("id='{$id}'")->select();
         $title = $dbres[0]['company_name'];
         $this->assign("title",$title);
-
-        if($dbres[0]['company_type'] == 3){
-            //上游
-            $this->viewCpPool($dbres,$is_export);
-        }elseif($dbres[0]['company_type'] == 1){
-            //下游公司
-            $this->viewPcPool($dbres,$is_export);
-        }else{
-            $this->viewPuPool($dbres,$is_export);
-        }
+        $this->viewPuPool($dbres,$is_export);
 
     }
     //个人汇总结算查看
@@ -191,32 +186,40 @@ class ExcelPaymentController extends BaseController
             if($is_export){
                 $v['sum_money_exp'] = "=";
             }
+            $row = 0;
             foreach($v['statement_info'] as $ke=>&$va){
-                $line ++;
-                if(isset($va['ratio'])){
-                    $va['increment_ratio'] = 0;
-                }else{
-                    $va['ratio'] = 0;
-                }
-
-                if($is_export){
-                    //J3*(K3+L3)+M3-N3
-                    $va['sum_money'] =  "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}";
-                    $count['sum_money_exp'] .= "O{$line}+";
-                    $count['platform_amount_exp'] .= "J{$line}+";
-
-                }else{
-                    $count['platform_amount'] += $va['pay_amount'];
-                    $count['sum_money'] +=  $va['sum_money'];
+                $va['row'] = count($va['game_list']);
+                $row += count($va['game_list']);
+                foreach($va['game_list'] as $key=>&$val){
+                    $line ++;
+                    if(isset($val['ratio'])){
+                        $val['increment_ratio'] = 0;
+                    }else{
+                        $val['ratio'] = 0;
+                    }
+                    if($is_export){
+                        //J3*(K3+L3)+M3-N3
+                        $va['sum_money'] =  "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}";
+                        $count['sum_money_exp'] .= "O{$line}+";
+                        $count['platform_amount_exp'] .= "J{$line}+";
+    
+                    }else{
+                        $count['platform_amount'] += $va['pay_amount'];
+                        $count['sum_money'] +=  $va['sum_money'];
+                    }
                 }
+               
+               
             }
-            $v['statement_count'] = count($v['statement_info']);
+
+            $v['statement_count'] = $row;
             
         }
         if($is_export){
             $count["platform_amount"] = "=".trim($count["platform_amount_exp"],"+");
             $count["sum_money"] = "=".trim($count["sum_money_exp"],"+");
         }
+        dd($infolist);
         $this->assign("data",$infolist);
         $this->assign("count",$count);
         $this->assign("is_export",$is_export);
diff --git a/Application/Payment/View/ExcelPayment/lists.html b/Application/Payment/View/ExcelPayment/lists.html
index 73a4c20ac..5d7119848 100644
--- a/Application/Payment/View/ExcelPayment/lists.html
+++ b/Application/Payment/View/ExcelPayment/lists.html
@@ -131,6 +131,10 @@
                 </select>
             </div>
 
+            <div class="input-list">
+                <input type="text" name="batch_num" placeholder="批次号" value="{:I('batch_num')}">
+            </div>
+
             <div class="input-list">
                 <input type="text" readonly id="time_start2" name="pay_time_start" class="" value="{:I('pay_time_start')}" placeholder="支付开始时间" />
                 &nbsp;-&nbsp;
diff --git a/Application/Payment/View/ExcelPayment/viewPuPool.html b/Application/Payment/View/ExcelPayment/viewPuPool.html
index bc15698e0..0c24f8ab9 100644
--- a/Application/Payment/View/ExcelPayment/viewPuPool.html
+++ b/Application/Payment/View/ExcelPayment/viewPuPool.html
@@ -125,6 +125,7 @@
                             <td rowspan="{$com.statement_count}">{$com.company_name}</td>
 
                             <td rowspan="{$com.statement_count}">{$com.company_info.account}</td>
+                            
                             <td rowspan="{$com.statement_count}">{$com.company_info.company_relation_str}</td>
                             <td rowspan="{$com.statement_count}">{$com.company_info.nickname}</td>
                             <td rowspan="{$com.statement_count}">{$com.company_info.company_type_str}</td>