From 0a049e0391422b244f718fa48dcea5732c35b832 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 12 Aug 2020 20:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 198518648..e78d86d9f 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -322,10 +322,6 @@ class CompanyStatementPoolController extends ThinkController $v['statement_money_exp'] .= "H{$line}+"; $va['d_statement_money'] = "=D{$line}*(1-G{$line})*(E{$line}+F{$line})"; - - $count['platform_amount_exp'] .= "D{$line}+"; - $count['d_statement_money_exp'] .= "H{$line}+"; - }else{ $va['d_statement_money'] = round($va['pay_amount']*($va['ratio']+$va['increment_ratio'])*(100-$va['fax_ratio'])/100/100,2); @@ -339,11 +335,6 @@ class CompanyStatementPoolController extends ThinkController if($is_export){ $v['statement_money_exp'] .= "J{$cline}-I{$cline}"; $v['statement_money'] = $v['statement_money_exp']; - - $count['fine_exp'] .= "I{$cline}+"; - $count['reward_exp'] .= "J{$cline}+"; - - $count['statement_money_exp'] .= "K{$cline}+"; }else{ $count['fine'] += $v['fine']; $count['reward'] += $v['reward']; @@ -353,11 +344,11 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ - $count["d_statement_money"] = "=".trim($count["d_statement_money_exp"],"+"); - $count["platform_amount"] = "=".trim($count["platform_amount_exp"],"+"); - $count["fine"] = "=".trim($count["fine_exp"],"+"); - $count["reward"] = "=".trim($count["reward_exp"],"+"); - $count["statement_money"] = "=".trim($count["statement_money_exp"],"+"); + $count["platform_amount"] = "=SUM(D2:D".$line.")"; + $count["d_statement_money"] = "=SUM(H2:H".$line.")"; + $count["fine"] = "=SUM(I2:I".$line.")"; + $count["reward"] = "=SUM(J2:J".$line.")"; + $count["statement_money"] = "=SUM(K2:K".$line.")"; } // dd($infolist); $this->assign("data",$infolist);