汇总功能修正

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -402,6 +402,7 @@ class CompanyStatementPoolController extends ThinkController
                         $v['statement_money'] .= "O{$line}+";
                     }else{
                         $count['platform_amount'] += $val['pay_amount'];
+                        $count['week_money'] +=  $val['sum_money'];
                         $count['sum_money'] +=  $val['sum_money'];
                     }
                 }
@@ -428,7 +429,8 @@ class CompanyStatementPoolController extends ThinkController
 
         if($is_export){
             $count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
-            $count["sum_money"] = "=ROUND(SUM(R2:R".$line."),2)";
+            $count["week_money"] = "=ROUND(SUM(R2:R".$line."),2)";
+            $count["sum_money"] = "=ROUND(SUM(S2:S".$line."),2)";
         }
 //        die();
         $this->assign("data",$infolist);

Application/Admin/View/CompanyStatementPool/viewCpPool.html

@@ -140,8 +140,8 @@
                             <td rowspan="{$com.statement_count}">{$com.company_name}</td>
                             <td rowspan="{$com.statement_count}">{$com.matche_platform}</td>
                             <!-- <td rowspan="{$com.statement_count}">{$com.statement_begin_time} ~ {$com.statement_end_time}</td> -->
-                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['time']}</td>
-<!--                            <td>{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}</td>-->
+<!--                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['time']}</td>-->
+                            <td>{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}</td>
 
                             <td>{$com['statement_info'][0]['game_name']}</td>
                             <td>{$com['statement_info'][0]['pay_amount']}</td>

Application/Admin/View/CompanyStatementPool/viewPuPool.html

@@ -305,7 +305,7 @@
                             <td></td>
                             <td></td>
                             <td></td>
-                            <td>{$count.sum_money}</td>
+                            <td>{$count.week_money}</td>
                             <td>{$count.sum_money}</td>
                             <td></td>
                             <td></td>