Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master

优化下游结算为支付时间

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'])){

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];