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

Merge branch 'new_change' of wmtx/platform into master

Browse Source 
汇总bug修改
master
廖金灵 4 years ago committed by Gogs
parent 7431575d0f e098384635
commit da2dc09690
1 changed files with 71 additions and 39 deletions
Show Stats Download Patch File Download Diff File

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

@ -367,7 +367,9 @@ class CompanyStatementPoolController extends ThinkController
if($is_export){ if($is_export){
$v['statement_money'] = "=ROUND("; $v['statement_money'] = "=ROUND(";
} }
$handle_data = $this->changeDataStruct($v['statement_info'],$is_export,$week_line);
$v['statement_info'] = $handle_data;
$row = 0; $row = 0;
foreach($v['statement_info'] as $ke=>&$va){ foreach($v['statement_info'] as $ke=>&$va){
$va['row'] = count($va['game_list']); $va['row'] = count($va['game_list']);
@ -408,9 +410,7 @@ class CompanyStatementPoolController extends ThinkController
} }
} }
$handle_data = $this->changeDataStruct($v['statement_info'],$is_export,$week_line);
$v['statement_info'] = $handle_data;
$v['row'] = $row; $v['row'] = $row;
@ -427,6 +427,7 @@ class CompanyStatementPoolController extends ThinkController
} }
} }
if($is_export){ if($is_export){
$count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)"; $count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
$count["week_money"] = "=ROUND(SUM(R2:R".$line."),2)"; $count["week_money"] = "=ROUND(SUM(R2:R".$line."),2)";
@ -443,7 +444,7 @@ class CompanyStatementPoolController extends ThinkController
$game_list = []; $game_list = [];
$old_line = $week_line; $old_line = $week_line;
// dump($statement_info);
//使用时间与会长账号作为键值分离数据 //使用时间与会长账号作为键值分离数据
foreach($statement_info as $sk=>$sv){ foreach($statement_info as $sk=>$sv){
@ -455,6 +456,7 @@ class CompanyStatementPoolController extends ThinkController
} }
} }
// dump($game_list);
$game_data = []; $game_data = [];
$handle_data = []; $handle_data = [];
@ -495,6 +497,7 @@ class CompanyStatementPoolController extends ThinkController
} }
} }
// dump($handle_data);
$substract = 1; $substract = 1;
// dump($game_list); // dump($game_list);
// dump($handle_data); // dump($handle_data);
@ -503,6 +506,7 @@ class CompanyStatementPoolController extends ThinkController
foreach($handle_data as $hk => $hv) { foreach($handle_data as $hk => $hv) {
if($hk > 0) { if($hk > 0) {
for (;;) { for (;;) {
if (!$handle_data[$hk-$substract]['time']) { if (!$handle_data[$hk-$substract]['time']) {
@ -512,64 +516,92 @@ class CompanyStatementPoolController extends ThinkController
} }
} }
// if (
//// $hv['account'] == 'zj9587' ||
// $hv['account'] == 'ruiyou' || $hv['account'] == 'weicheng') {
// dump($handle_data);
// }
// dump($hv); // dump($hv);
if ($hv['time'] == $handle_data[$hk-$substract]['time']&&!$is_export) { if ($hv['time'] == $handle_data[$hk-$substract]['time']) {
$handle_data[$hk-$substract]['time_row'] += $handle_data[$hk]['time_row']; $handle_data[$hk-$substract]['time_row'] += $handle_data[$hk]['time_row'];
if ($is_export) {
$week_line++;
$handle_data[$hk-$substract]['week_amount'] = "=ROUND(SUM(O{$old_line}:O{$week_line}),2)";
$old_line++;
} else {
$handle_data[$hk-$substract]['week_amount'] += $handle_data[$hk]['week_amount']; $handle_data[$hk-$substract]['week_amount'] += $handle_data[$hk]['week_amount'];
}
unset($handle_data[$hk]['time']); unset($handle_data[$hk]['time']);
unset($handle_data[$hk]['time_row']); unset($handle_data[$hk]['time_row']);
unset($handle_data[$hk]['week_amount']); unset($handle_data[$hk]['week_amount']);
} else {
if ($is_export) {
// dump($old_line);
if (count($hv['game_list'])>1) {
$week_line += count($hv['game_list'])-1;
} }
$substract = 1;
$handle_data[$hk]['week_amount'] = "=ROUND(SUM(O{$old_line}:O{$week_line}),2)";
$old_line++;
$week_line++;
} }
} }
// $substract = 0;
foreach($handle_data as $hk => $hv) {
$substract = 1; $substract = 1;
}else {
if ($is_export) { if ($is_export) {
// if (
//// $hv['account'] == 'zj9587' ||
// $hv['account'] == 'ruiyou' || $hv['account'] == 'weicheng') {
// dump($handle_data);
// }
for (;;) {
if (!$handle_data[$hk+$substract]['time']&&$handle_data[$hk+$substract]['account']) {
// if (
// $hv['account'] == 'zj9587' ||
// $hv['account'] == 'ruiyou' || $hv['account'] == 'weicheng') {
// dump($handle_data[$hk]['time']);
// }
$week_line++;
$substract++;
} else {
break;
}
}
if (count($hv['game_list'])>1) { if (count($hv['game_list'])>1) {
$week_line += count($hv['game_list'])-1; $week_line += count($hv['game_list'])-1;
} }
// if (
//// $hv['account'] == 'zj9587' ||
// $hv['account'] == 'ruiyou' || $hv['account'] == 'weicheng') {
// dump($handle_data);
// }
$handle_data[$hk]['week_amount'] = "=ROUND(SUM(O{$old_line}:O{$week_line}),2)"; $handle_data[$hk]['week_amount'] = "=ROUND(SUM(O{$old_line}:O{$week_line}),2)";
if (count($hv['game_list'])>1) { if (count($hv['game_list'])>1) {
$old_line += count($hv['game_list'])-1;
$old_line += count($hv['game_list']);
// if (
//// $hv['account'] == 'zj9587' ||
// $hv['account'] == 'DCX1012' || $hv['account'] == 'chuangshi168') {
// dump($old_line);
// }
} else { } else {
$old_line++; $old_line++;
} }
if(count($hv['game_list'])>1) { if(count($hv['game_list'])>1) {
$week_line = $old_line + 1; $week_line = $old_line ;
} else { } else {
$week_line = $old_line; $week_line = $old_line;
} }
// if (
//// $hv['account'] == 'zj9587' ||
// $hv['account'] == 'DCX1012' || $hv['account'] == 'chuangshi168') {
// dump($week_line);
// }
} }
}
} }
// dump($handle_data); // dump($handle_data);
return $handle_data?$handle_data:[]; return $handle_data?$handle_data:[];
} }

Write Preview
Loading…
Cancel
Save