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

优化下游推广公司导出

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -188,7 +188,7 @@ class PromoteCompanyController extends ThinkController
         $promotemap['p.company_id']=["in",$companyallids];
         $promotemap['p.level']=1;
         $promotecount = M("Promote","tab_")->alias('p')->where($promotemap)->count();
-//         dd($companyres);
+        // dd($companyres);
         $this->assign('listData', $companyres);
         $this->assign('count', $count);
         $this->assign('promotecount', $promotecount);
@@ -1300,7 +1300,7 @@ class PromoteCompanyController extends ThinkController
             if($is_export){
                 $CpRadio = $this->getPromoteCompanyCpRadio($game_ids);
             }
-
+            // dd($CpRadio);
             $endtime = time();
             $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();
@@ -1334,7 +1334,6 @@ class PromoteCompanyController extends ThinkController
                     }
                 }
             }
-            
             if(empty($game_arr)){
                 return $senddata;
             }

Application/Admin/View/PromoteCompany/export.html

@@ -209,8 +209,8 @@
                                         <td>{$p_ratio['turnover_ratio'][0]['name']|default="--"}</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 />
                                         <td >-</td>
                                         <td>-</td>