From f450df3265f01d288418eccdb1fd49a8cdee6f41 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 29 Oct 2020 19:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementPoolController.class.php | 4 +++-
 Application/Admin/View/CompanyStatementPool/viewCpPool.html   | 4 ++--
 Application/Admin/View/CompanyStatementPool/viewPuPool.html   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 62cb362d5..481b9b0c9 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/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);
diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html
index e0cc3468c..42b844d8a 100644
--- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html
+++ b/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>
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index caabbedc7..53a4d1ef0 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/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>