From 071c8c78f4a714cb2aca736f5f495d00995c8fc1 Mon Sep 17 00:00:00 2001
From: chenzhi <294767167@11qq.com>
Date: Mon, 3 Aug 2020 21:41:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=B8=BA=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementSetController.class.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index bf7da560a..a0f1818de 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -757,7 +757,7 @@ class CompanyStatementSetController extends Controller {
 		$Spend = M("Spend","tab_");
 		$spenMap = [
 			"s.pay_status"=>1,
-			"s.pay_time"=>['between', [$begintime,$endtime]],
+			"s.payed_time"=>['between', [$begintime,$endtime]],
 		];
 		for ($i=0; $i <count($idarr); $i++) {
             $company_id = $idarr[$i];

From 651aa6cc8b1b9483715f46accf01fb4cbb37ad41 Mon Sep 17 00:00:00 2001
From: chenzhi <294767167@11qq.com>
Date: Mon, 3 Aug 2020 21:51:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E8=B6=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementPoolController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index fa419b6ac..b0d01a58f 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -214,10 +214,10 @@ class CompanyStatementPoolController extends ThinkController
         
         if($infolist[0]['company_type'] == 3){
             //上游
-            $this->viewCpPool($infolist,$is_export);
+            $this->viewCpPool($infolist,$is_export,$pool_info);
         }elseif($infolist[0]['company_type'] == 1){
             //下游公司
-            $this->viewPcPool($infolist,$is_export);
+            $this->viewPcPool($infolist,$is_export,$pool_info);
         }else{
             //获取母单
             if(!empty($pool_info['create_lack_ids'])){