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

子系统上游修正

Browse Source
master
zhengyongxing 4 years ago
parent 2f9a822583
commit 68c873983b
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -642,18 +642,18 @@ class CompanyStatementController extends ThinkController
->select();
$use_data = [
"01"=>["time"=>"01","show_company_name"=>$data[0]["company_name"],"row"=>1],
"02"=>["time"=>"02","show_company_name"=>$data[0]["company_name"],"row"=>1],
"03"=>["time"=>"03","show_company_name"=>$data[0]["company_name"],"row"=>1],
"04"=>["time"=>"04","show_company_name"=>$data[0]["company_name"],"row"=>1],
"05"=>["time"=>"05","show_company_name"=>$data[0]["company_name"],"row"=>1],
"06"=>["time"=>"06","show_company_name"=>$data[0]["company_name"],"row"=>1],
"07"=>["time"=>"07","show_company_name"=>$data[0]["company_name"],"row"=>1],
"08"=>["time"=>"08","show_company_name"=>$data[0]["company_name"],"row"=>1],
"09"=>["time"=>"09","show_company_name"=>$data[0]["company_name"],"row"=>1],
"10"=>["time"=>"10","show_company_name"=>$data[0]["company_name"],"row"=>1],
"11"=>["time"=>"11","show_company_name"=>$data[0]["company_name"],"row"=>1],
"12"=>["time"=>"12","show_company_name"=>$data[0]["company_name"],"row"=>1],
"01"=>["time"=>"01","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.01.01','statement_end_time'=>$time.'.01.'.date('t',strtotime($time.'01'))]]],
"02"=>["time"=>"02","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.02.01','statement_end_time'=>$time.'.02.'.date('t',strtotime($time.'02'))]]],
"03"=>["time"=>"03","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.03.01','statement_end_time'=>$time.'.03.'.date('t',strtotime($time.'03'))]]],
"04"=>["time"=>"04","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.04.01','statement_end_time'=>$time.'.04.'.date('t',strtotime($time.'04'))]]],
"05"=>["time"=>"05","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.05.01','statement_end_time'=>$time.'.05.'.date('t',strtotime($time.'05'))]]],
"06"=>["time"=>"06","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.06.01','statement_end_time'=>$time.'.06.'.date('t',strtotime($time.'06'))]]],
"07"=>["time"=>"07","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.07.01','statement_end_time'=>$time.'.07.'.date('t',strtotime($time.'07'))]]],
"08"=>["time"=>"08","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.08.01','statement_end_time'=>$time.'.08.'.date('t',strtotime($time.'08'))]]],
"09"=>["time"=>"09","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.09.01','statement_end_time'=>$time.'.09.'.date('t',strtotime($time.'09'))]]],
"10"=>["time"=>"10","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.10.01','statement_end_time'=>$time.'.10.'.date('t',strtotime($time.'10'))]]],
"11"=>["time"=>"11","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.11.01','statement_end_time'=>$time.'.11.'.date('t',strtotime($time.'11'))]]],
"12"=>["time"=>"12","show_company_name"=>$data[0]["company_name"],"row"=>1,"withdraw_type"=>$data[0]["withdraw_type"],"statement_info"=>[['statement_begin_time'=>$time.'.12.01','statement_end_time'=>$time.'.12.'.date('t',strtotime($time.'12'))]]],
];
$row = 0;
@ -719,10 +719,14 @@ class CompanyStatementController extends ThinkController
$assign_data[] = array_values($use_data);
}
// dump($assign_data);
foreach ($assign_data as $key => $value) {
foreach ($value as $k => $v) {
$assign_data[$key][$k]["row"] = count($v["statement_info"])?count($v["statement_info"]):1;
if (count($v["statement_info"]) > 1) {
unset($assign_data[$key][$k]['statement_info'][0]);
$assign_data[$key][$k]['statement_info'] = array_values($assign_data[$key][$k]['statement_info']);
}
$assign_data[$key][$k]["row"] = count($assign_data[$key][$k]["statement_info"])?count($assign_data[$key][$k]["statement_info"]):1;
}
}

32
Application/Admin/View/CompanyStatement/showCpStatementView.html
Unescape Escape View File

@ -126,9 +126,16 @@
<foreach name="first_data" item="datas">
<tr>
<td rowspan="{$datas['row']}">{$datas['show_company_name']}</td>
<td rowspan="{$datas['row']}">{$time}年{$datas["time"]}月</td>
<if condition="$datas['withdraw_type'] neq 0">
<td rowspan="{$datas['row']}">{$time}年{$datas["time"]}月</td>
</if>
<if condition="$datas['statement_info'][0]['statement_type'] gt 0">
<td>{$datas['statement_info'][0]['game_name']|default="--"}<if condition="$datas['statement_info'][0]['withdraw_type'] eq 0 and $datas['statement_info'][0]['statement_begin_time']">({$datas['statement_info'][0]['statement_begin_time']}-{$datas['statement_info'][0]['statement_end_time']})</if></td>
<if condition="$datas['withdraw_type'] eq 0">
<td>
{$datas['statement_info'][0]['statement_begin_time']}-{$datas['statement_info'][0]['statement_end_time']}
</td>
</if>
<td>{$datas['statement_info'][0]['game_name']|default="--"}</td>
<td>--</td>
<td>--</td>
<td>--</td>
@ -138,7 +145,12 @@
<td>--</td>
<td><if condition="$datas['statement_info'][0]['statement_type'] eq 2">-</if>{$datas['statement_info'][0]['sum_money']|default="--"}</td>
<else/>
<td>{$datas['statement_info'][0]['game_name']|default="--"}<if condition="$datas['statement_info'][0]['withdraw_type'] eq 0 and $datas['statement_info'][0]['statement_begin_time']">({$datas['statement_info'][0]['statement_begin_time']}-{$datas['statement_info'][0]['statement_end_time']})</if></td>
<if condition="$datas['withdraw_type'] eq 0">
<td>
{$datas['statement_info'][0]['statement_begin_time']}-{$datas['statement_info'][0]['statement_end_time']}
</td>
</if>
<td>{$datas['statement_info'][0]['game_name']|default="--"}</td>
<td>{$datas['statement_info'][0]['platform_money']|default="--"}</td>
<td>{$datas['statement_info'][0]['aggregate_money']|default="--"}</td>
<td>{$datas['statement_info'][0]['sum_amount']|default="--"}</td>
@ -154,7 +166,12 @@
<foreach name="datas['statement_info']" item="statement_info" key="skey">
<if condition="$skey gt 0">
<if condition="$statement_info['statement_type'] gt 0">
<td>{$statement_info['game_name']|default="--"}<if condition="$datas['statement_info'][0]['withdraw_type'] eq 0 and $statement_info['statement_begin_time']">({$statement_info['statement_begin_time']}-{$statement_info['statement_end_time']})</if></td>
<if condition="$datas['withdraw_type'] eq 0">
<td>
{$statement_info['statement_begin_time']}-{$statement_info['statement_end_time']}
</td>
</if>
<td>{$statement_info['game_name']|default="--"}</td>
<td>--</td>
<td>--</td>
<td>--</td>
@ -165,7 +182,12 @@
<td><if condition="$statement_info['statement_type'] eq 2">-</if>{$statement_info['sum_money']|default="--"}</td>
<else/>
<tr>
<td>{$statement_info['game_name']|default="--"}<if condition="$datas['statement_info'][0]['withdraw_type'] eq 0 and $statement_info['statement_begin_time']">({$statement_info['statement_begin_time']}-{$statement_info['statement_end_time']})</if></td>
<if condition="$datas['withdraw_type'] eq 0">
<td>
{$statement_info['statement_begin_time']}-{$statement_info['statement_end_time']}
</td>
</if>
<td>{$statement_info['game_name']|default="--"}</td>
<td>{$statement_info['platform_money']|default="--"}</td>
<td>{$statement_info['aggregate_money']|default="--"}</td>
<td>{$statement_info['sum_amount']|default="--"}</td>

Write Preview
Loading…
Cancel
Save