新增导出

Application/Admin/Controller/CompanyGameRatioController.class.php

@@ -62,16 +62,25 @@ class CompanyGameRatioController extends AdminController
             $v['settlement_type'] ='--';
             $v['begin_time'] = date("Y-m-d",$v['begin_time']);
             $v['end_time'] = $v['end_time'] ? date('Y-m-d', $v['end_time']) : '永久';
+
+            $v["valid"] = "{$v['begin_time']} ~~ {$v['end_time']}";
+
             $v['company_belong'] ="下游".getCompanyBlong($v['company_belong']);
             $v['verify_log'] = json_decode($v['verify_log'], true);
-            $v["create"]= "{$v['verify_log']['create_user']} <br/> {$v['verify_log']['create_time']}";
+            if (isset($params['export'])) {
+                $symbol = "\n";
+            } else {
+                $symbol = "<br>";
+            }
+
+            $v["create"]= "{$v['verify_log']['create_user']} {$symbol} {$v['verify_log']['create_time']}";
             if(isset($v['verify_log']['market_user'])){
                 if($v['status'] == -1){
                     $ts = "审核拒绝";
                 }else{
                     $ts = "审核通过";
                 }
-                $v["market"]= "{$ts}({$v['verify_log']['market_user']}) <br/> {$v['verify_log']['market_time']}";
+                $v["market"]= "{$ts}({$v['verify_log']['market_user']}) {$symbol} {$v['verify_log']['market_time']}";
             }else{
                 $v["market"] = '--';
             }
@@ -82,7 +91,7 @@ class CompanyGameRatioController extends AdminController
                 }else{
                     $ts = "审核通过";
                 }
-                $v["admin"]= "{$ts}({$v['verify_log']['admin_user']}) <br/> {$v['verify_log']['admin_time']}";
+                $v["admin"]= "{$ts}({$v['verify_log']['admin_user']}) {$symbol} {$v['verify_log']['admin_time']}";
             }else{
                 $v["admin"] = '--';
             }
@@ -90,11 +99,7 @@ class CompanyGameRatioController extends AdminController
             $thisTurnoverRatios = $v['turnover_ratio'] ? json_decode($v['turnover_ratio'], true) : [];
             $thisRatioDtl = "默认：{$v['ratio']}%";
             if ($thisTurnoverRatios) {
-                if (I('export', 0) == 1) {
-                    $symbol = "\n";
-                } else {
-                    $symbol = "<br>";
-                }
+                
                 foreach ($thisTurnoverRatios as $thisTurnoverRatio) {
                     $thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥';
                     $thisRatioDtl .= "{$symbol}月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%";
@@ -105,11 +110,6 @@ class CompanyGameRatioController extends AdminController
             $lastTurnoverRatios = $v['last_turnover_ratio'] ? json_decode($v['last_turnover_ratio'], true) : [];
             $lastRatioDtl = "默认：{$v['last_ratio']}%";
             if ($lastTurnoverRatios) {
-                if (I('export', 0) == 1) {
-                    $symbol = "\n";
-                } else {
-                    $symbol = "<br>";
-                }
                 foreach ($lastTurnoverRatios as $thisTurnoverRatio) {
                     $thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥';
                     $lastRatioDtl .= "{$symbol}月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%";
@@ -119,6 +119,29 @@ class CompanyGameRatioController extends AdminController
             $v['oplist'] = $this->OpAuth($v);
             
         }
+
+        if(isset($_REQUEST['export'])){
+            $GetData = $_GET;
+            unset($GetData['export']);
+            addOperationLog(['op_type'=>3,'key'=>getNowDate(),"op_name"=>"导出",'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData)]);
+
+            data2csv($dbres,'推广游戏分成管理',array(
+                "company_name"=>"公司名称",
+                "company_belong"=>"内外团",
+                "settlement_type"=>"结算周期",
+                "game_type_name"=>"游戏类型",
+                "original_package_name"=>"原游戏名称",
+                "relation_game_name"=>"现游戏名称",
+                "valid"=>"生效时间",
+                "last_turnover_ratio_str"=>"原比例",
+                "turnover_ratio_str"=>"申请比例",
+                "create"=>"创建记录",
+                "market"=>"市场部审批",
+                "admin"=>"管理员审批",
+                "remark"=>"备注"
+            ));
+        }
+
         $count = M("company_game_ratio_log","tab_")->alias('m')->field("count(id) count")->where($where)->find()['count'];
         $this->assign('data', $dbres);
         $page = set_pagination($count, $row);

Application/Admin/View/CompanyGameRatio/index.html

@@ -148,7 +148,7 @@
                             <td>{$data.game_type_name}</td>
                             <td>{$data.original_package_name}</td>
                             <td>{$data.relation_game_name}</td>
-                            <td>{$data.begin_time} ~~ {$data.end_time}</td>
+                            <td>{$data.valid}</td>
                             <td style="line-height: 16px;text-indent: 0;">
                                 <div style="text-align: left;width: 90%;margin-left: 5%;margin-top: 10px;margin-bottom: 10px;">
                                     {$data.last_turnover_ratio_str}