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 3310553654 9c11344906
commit 082d5c1eee
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File

3
Application/Admin/Controller/PromoteCompanyController.class.php
Unescape Escape View File

@ -1300,7 +1300,7 @@ class PromoteCompanyController extends ThinkController
if($is_export){ if($is_export){
$CpRadio = $this->getPromoteCompanyCpRadio($game_ids); $CpRadio = $this->getPromoteCompanyCpRadio($game_ids);
} }
// dd($CpRadio);
$endtime = time(); $endtime = time();
$rwhere = "(end_time = 0 OR end_time >= '{$endtime}') and company_id='{$company_id}' and relation_game_id in ({$game_ids})"; $rwhere = "(end_time = 0 OR end_time >= '{$endtime}') and company_id='{$company_id}' and relation_game_id in ({$game_ids})";
$cgr_res = M("CompanyGameRatio","tab_")->where($rwhere)->select(); $cgr_res = M("CompanyGameRatio","tab_")->where($rwhere)->select();
@ -1334,7 +1334,6 @@ class PromoteCompanyController extends ThinkController
} }
} }
} }
if(empty($game_arr)){ if(empty($game_arr)){
return $senddata; return $senddata;
} }

4
Application/Admin/View/PromoteCompany/export.html
Unescape Escape View File

@ -209,8 +209,8 @@
<td>{$p_ratio['turnover_ratio'][0]['name']|default="--"}</td> <td>{$p_ratio['turnover_ratio'][0]['name']|default="--"}</td>
<td>{$p_ratio['turnover_ratio'][0]['ratio']|showPercent}</td> <td>{$p_ratio['turnover_ratio'][0]['ratio']|showPercent}</td>
<td>{$p_ratio['cp_ratio'][$gamekey]['name']|default="--"}</td> <td>{$p_ratio['cp_ratio'][0]['name']|default="--"}</td>
<td>{$p_ratio['cp_ratio'][$gamekey]['ratio']|showPercent}</td> <td>{$p_ratio['cp_ratio'][0]['ratio']|showPercent}</td>
<else /> <else />
<td >-</td> <td >-</td>
<td>-</td> <td>-</td>

Write Preview
Loading…
Cancel
Save