diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 80ec1f258..6e023f83b 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -817,15 +817,15 @@ class CompanyStatementPoolController extends ThinkController } } } - - + if($is_export){ if($v['withdraw_type'] != 3) { - $val['sum_money'] = "=ROUND((K{$line}-L{$line})*(M{$line}+N{$line}),2)"; + $val['sum_money'] = "=ROUND((L{$line}-M{$line})*(N{$line}+O{$line}),2)"; + $v['statement_money'] .= "T{$line}+"; } else { - $val['sum_money'] = "=ROUND((K{$line}-L{$line})*(N{$line}),2)"; + $val['sum_money'] = "=ROUND((L{$line}-M{$line})*(O{$line}),2)"; + $v['statement_money'] .= "T{$line}+"; } - $v['statement_money'] .= "S{$line}+"; }else{ $count['platform_amount'] += $val['pay_amount']; } @@ -867,16 +867,16 @@ class CompanyStatementPoolController extends ThinkController $count["pool_week_count"] = $this->setWeekCount($line,true); $count["pool_lack_count"] = $this->setlackCount($line,true); //本周暂不结算合计 - $count["st_lack_count"] = '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"否"),2)'; + $count["st_lack_count"] = '=ROUND(SUMIFS(U2:U'.$line.',Z2:Z'.$line.',"否"),2)'; //本次应支付 - $count["st_count"] = '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"是"),2)'; + $count["st_count"] = '=ROUND(SUMIFS(U2:U'.$line.',Z2:Z'.$line.',"是"),2)'; - $count["online_pay"] = '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"是",X2:X'.$line.',"是"),2)'; - $count["offline_pay"] = '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"是",X2:X'.$line.',"否"),2)'; + $count["online_pay"] = '=ROUND(SUMIFS(U2:U'.$line.',Z2:Z'.$line.',"是",Z2:Z'.$line.',"是"),2)'; + $count["offline_pay"] = '=ROUND(SUMIFS(U2:U'.$line.',Z2:Z'.$line.',"是",Z2:Z'.$line.',"否"),2)'; } - $count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)"; - $count["week_money"] = "=ROUND(SUM(S2:S".$line."),2)"; - $count["sum_money"] = "=ROUND(SUM(T2:T".$line."),2)"; + $count["platform_amount"] = "=ROUND(SUM(L2:L".$line."),2)"; + $count["week_money"] = "=ROUND(SUM(T2:T".$line."),2)"; + $count["sum_money"] = "=ROUND(SUM(U2:U".$line."),2)"; } // die(); $this->assign("data",$infolist); @@ -895,16 +895,16 @@ class CompanyStatementPoolController extends ThinkController $pool_week_line = 0; } if($pool_week_str == "="){ - $pool_week_str .= "SUM(K{$line}:"; + $pool_week_str .= "SUM(L{$line}:"; }else{ if($line - $pool_week_line > 1){ //不连续 - $pool_week_str .= "K{$pool_week_line})+SUM(K{$line}:"; + $pool_week_str .= "L{$pool_week_line})+SUM(L{$line}:"; } } $pool_week_line = $line; if($return){ - $data = $pool_week_str."K{$line})"; + $data = $pool_week_str."L{$line})"; unset($pool_week_str,$pool_week_line); return $data; } @@ -918,16 +918,16 @@ class CompanyStatementPoolController extends ThinkController $pool_lack_line = 0; } if($pool_lack_str == "="){ - $pool_lack_str .= "SUM(K{$line}:"; + $pool_lack_str .= "SUM(L{$line}:"; }else{ if($line - $pool_lack_line > 1){ //不连续 - $pool_lack_str .= "K{$pool_lack_line})+SUM(K{$line}:"; + $pool_lack_str .= "L{$pool_lack_line})+SUM(L{$line}:"; } } $pool_lack_line = $line; if($return){ - $data = $pool_lack_str."K{$line})"; + $data = $pool_lack_str."L{$line})"; unset($pool_lack_str,$pool_lack_line); return $data; } diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index 7f0352ae2..09ffb8cce 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -421,7 +421,7 @@