elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/finance_statement_three' of wmtx/platform into release

Browse Source 
优化导出保留两位小数
master
陈志 4 years ago committed by Gogs
parent 7469d22c36 4a3cb6f6bb
commit e6b715faab
4 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File

10
Application/Admin/Common/extend.php
Unescape Escape View File

@ -2036,9 +2036,10 @@ function excelSpecialComplementEmplate($data, $all_sum_money, $all_pay_amount, $
} else {//游戏
$product_name = $value['game_name'];
$objPHPExcel->getActiveSheet()->getStyle('D'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00);
$objPHPExcel->getActiveSheet()->getStyle('E'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_000);
$objPHPExcel->getActiveSheet()->getStyle('D'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE);
$objPHPExcel->getActiveSheet()->getStyle('E'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE);
$objPHPExcel->getActiveSheet()->getStyle('C'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_00);
$objPHPExcel->getActiveSheet()->getStyle('F'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_00);
if($data['withdraw_type'] != 3) {
@ -2166,9 +2167,10 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
} else {//游戏
$product_name = $value['game_name'];
$objPHPExcel->getActiveSheet()->getStyle('D'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00);
$objPHPExcel->getActiveSheet()->getStyle('E'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_000);
$objPHPExcel->getActiveSheet()->getStyle('D'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE);
$objPHPExcel->getActiveSheet()->getStyle('E'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE);
$objPHPExcel->getActiveSheet()->getStyle('C'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_00);
$objPHPExcel->getActiveSheet()->getStyle('F'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_00);
if($value['increment_ratio'] == 0){
$value['increment_ratio'] = 0;

14
Application/Admin/Controller/CompanyStatementController.class.php
Unescape Escape View File

@ -587,7 +587,7 @@ class CompanyStatementController extends ThinkController
$cline = $line+1;
if($is_export){
$v['statement_money'] = "=";
$v['statement_money'] = "=ROUND(";
}
$row = 0;
@ -607,9 +607,9 @@ class CompanyStatementController extends ThinkController
if($is_export){
if($v['withdraw_type'] != 3) {
$val['sum_money'] = "=K{$line}*(L{$line}+M{$line})";
$val['sum_money'] = "=ROUND(K{$line}*(L{$line}+M{$line}),2)";
} else {
$val['sum_money'] = "=K{$line}*(M{$line})";
$val['sum_money'] = "=ROUND(K{$line}*(M{$line}),2)";
}
// $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})";
$v['statement_money'] .= "N{$line}+";
@ -634,17 +634,17 @@ class CompanyStatementController extends ThinkController
if($is_export){
if($v['withdraw_type'] != 3) {
$v['statement_money'] .="N{$cline}-O{$cline}";
$v['statement_money'] .="N{$cline}-O{$cline},2)";
} else {
$v['statement_money'] = substr($v['statement_money'],0,strlen($v['statement_money'])-1);
$v['statement_money'] = substr($v['statement_money'],0,strlen($v['statement_money'])-1).",2)";
}
// dump($v['statement_money']);die();
}
}
if($is_export){
$count["platform_amount"] = "=SUM(K2:K".$line.")";
$count["sum_money"] = "=SUM(Q2:Q".$line.")";
$count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
$count["sum_money"] = "=ROUND(SUM(Q2:Q".$line."),2)";
}
$this->assign("data",$infolist);
$this->assign("count",$count);

60
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -241,7 +241,7 @@ class CompanyStatementPoolController extends ThinkController
}
$cline = $line+1;
if($is_export){
$v['statement_money'] = "=";
$v['statement_money'] = "=ROUND(";
}
$row = 0;
@ -261,44 +261,30 @@ class CompanyStatementPoolController extends ThinkController
if($is_export){
if($v['withdraw_type'] != 3) {
$val['sum_money'] = "=K{$line}*(L{$line}+M{$line})";
$val['sum_money'] = "=ROUND(K{$line}*(L{$line}+M{$line}),2)";
} else {
$val['sum_money'] = "=K{$line}*(M{$line})";
$val['sum_money'] = "=ROUND(K{$line}*(M{$line}),2)";
}
// $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})";
$v['statement_money'] .= "N{$line}+";
}else{
$count['platform_amount'] += $val['pay_amount'];
$count['sum_money'] += $val['sum_money'];
}
}
// if($is_export){
// //J3*(K3+L3)+M3-N3
// if($va['statement_type'] > 0){ //罚款服务器费用
// $va['sum_money'] = "=J{$line}";
// }else{
// $va['sum_money'] = "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}";
// }
// }else{
// $count['platform_amount'] += $va['pay_amount'];
// $count['sum_money'] += $va['sum_money'];
// }
}
$v['row'] = $row;
if($is_export){
if($v['withdraw_type'] != 3) {
$v['statement_money'] .="O{$cline}-P{$cline}";
$v['statement_money'] .="O{$cline}-P{$cline},2)";
} else {
$v['statement_money'] = substr($v['statement_money'],0,strlen($v['statement_money'])-1);
$v['statement_money'] = substr($v['statement_money'],0,strlen($v['statement_money'])-1).",2)";
}
// dump($v['statement_money']);die();
}
}
if($is_export){
$count["platform_amount"] = "=SUM(K2:K".$line.")";
$count["sum_money"] = "=SUM(Q2:Q".$line.")";
$count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
$count["sum_money"] = "=ROUND(SUM(Q2:Q".$line."),2)";
}
$this->assign("data",$infolist);
$this->assign("count",$count);
@ -346,9 +332,9 @@ class CompanyStatementPoolController extends ThinkController
if($is_export){
if($v['withdraw_type'] != 3) {
$va['d_statement_money'] = "=D{$line}*(1-G{$line})*(E{$line}+F{$line})";
$va['d_statement_money'] = "=ROUND(D{$line}*(1-G{$line})*(E{$line}+F{$line}),2)";
} else {
$va['d_statement_money'] = "=D{$line}*(F{$line})";
$va['d_statement_money'] = "=ROUND(D{$line}*(F{$line}),2)";
}
}else{
if ($v['withdraw_type'] != 3) {
@ -370,7 +356,7 @@ class CompanyStatementPoolController extends ThinkController
if($is_export){
if ($v['withdraw_type'] != 3) {
$v['statement_money'] = "=SUM(H{$cline}:H{$line})+J{$cline}-I{$cline}";
$v['statement_money'] = "=ROUND(SUM(H{$cline}:H{$line})+J{$cline}-I{$cline},2)";
}
@ -383,11 +369,11 @@ class CompanyStatementPoolController extends ThinkController
}
if($is_export){
$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.")";
$count["platform_amount"] = "=ROUND(SUM(D2:D".$line."),2)";
$count["d_statement_money"] = "=ROUND(SUM(H2:H".$line."),2)";
$count["fine"] = "=ROUND(SUM(I2:I".$line."),2)";
$count["reward"] = "=ROUND(SUM(J2:J".$line."),2)";
$count["statement_money"] = "=ROUND(SUM(K2:K".$line."),2)";
}
// dd($infolist);
$this->assign("data",$infolist);
@ -431,7 +417,7 @@ class CompanyStatementPoolController extends ThinkController
$line ++;
$va['company_ratio'] = 100-$va['ratio'];
if($is_export){
$va['d_statement_money'] = "=F{$line}*G{$line}";
$va['d_statement_money'] = "=ROUND(F{$line}*G{$line},2)";
}else{
$va['d_statement_money'] = round($va['pay_amount']*$va['ratio']/100,2);
$count['platform_amount'] += $va['pay_amount'];
@ -441,7 +427,7 @@ class CompanyStatementPoolController extends ThinkController
}
$v['matche_platform'] = $Partner[$v['company_id']];
if($is_export){
$v['statement_money'] = "=SUM(K{$cline}:K{$line})+M{$cline}-L{$cline}";
$v['statement_money'] = "=ROUND(SUM(K{$cline}:K{$line})+M{$cline}-L{$cline},2)";
}else{
$count['fine'] += $v['fine'];
$count['reward'] += $v['reward'];
@ -451,12 +437,12 @@ class CompanyStatementPoolController extends ThinkController
}
if($is_export){
$count["d_statement_money"] = "=SUM(K3:K".$line.")";
$count["platform_amount"] = "=SUM(E3:E".$line.")";
$count["platform_amount2"] = "=SUM(F3:F".$line.")";
$count["fine"] = "=SUM(L3:L".$line.")";
$count["reward"] = "=SUM(M3:M".$line.")";
$count["statement_money"] = "=SUM(N3:N".$line.")";
$count["d_statement_money"] = "=ROUND(SUM(K3:K".$line."),2)";
$count["platform_amount"] = "=ROUND(SUM(E3:E".$line."),2)";
$count["platform_amount2"] = "=ROUND(SUM(F3:F".$line."),2)";
$count["fine"] = "=ROUND(SUM(L3:L".$line."),2)";
$count["reward"] = "=ROUND(SUM(M3:M".$line."),2)";
$count["statement_money"] = "=ROUND(SUM(N3:N".$line."),2)";
}
// dd($infolist);
$this->assign("data",$infolist);

BIN
Public/Admin/excel/down_stream.xls
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save