From b9567f6fafb521ee3afb9acea9565f03be268750 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 3 Aug 2020 16:39:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E6=88=B3?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 4 ++-- .../CompanyStatementSetController.class.php | 12 ++++++------ .../Admin/View/CompanyStatementPool/viewPuPool.html | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index f83a57c60..f22f7a468 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -239,8 +239,8 @@ class CompanyStatementPoolController extends ThinkController foreach($infolist as $k=>&$v){ $v['statement_info'] = json_decode($v['statement_info'],true); $v['company_info'] = json_decode($v['company_info'],true); - $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); - $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); + $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']); + $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']); $cline = $line+1; if($is_export){ $v['sum_money_exp'] = "="; diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 480dbd0ea..bf7da560a 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -255,8 +255,8 @@ class CompanyStatementSetController extends Controller { $GameDb = M("Game","tab_"); $StatementDb = M("CompanyStatement","tab_"); - $statement_begin_time = date("Y-m-d",$begintime); - $statement_end_time = date("Y-m-d",$endtime); + $statement_begin_time = date("Y.m.d",$begintime); + $statement_end_time = date("Y.m.d",$endtime); foreach($cpList as $k=>$v){ $add_data=[]; @@ -566,8 +566,8 @@ class CompanyStatementSetController extends Controller { $verify_log=json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s")]); $StatementDb = M("CompanyStatement","tab_"); - $statement_begin_time = date("Y-m-d",$begintime); - $statement_end_time = date("Y-m-d",$endtime); + $statement_begin_time = date("Y.m.d",$begintime); + $statement_end_time = date("Y.m.d",$endtime); $RewardRecord = M("RewardDetail","tab_"); foreach($pcList as $k=>$v){ if(!isset($pc[$k])){continue;}//不存在的公司不结算 @@ -915,8 +915,8 @@ class CompanyStatementSetController extends Controller { $this->getPromoteCompanySpend($pc,array_unique(array_keys($pc)),$begintime,$endtime); $StatementDb = M("CompanyStatement","tab_"); - $statement_begin_time = date("Y-m-d",$begintime); - $statement_end_time = date("Y-m-d",$endtime); + $statement_begin_time = date("Y.m.d",$begintime); + $statement_end_time = date("Y.m.d",$endtime); // $RewardRecord = M("RewardRecord","tab_"); $LackStatement = M("company_lack_statement_info","tab_"); $StatementInfo = M("company_statement_info","tab_"); diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index f3f9dcf08..ad3b017f0 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -143,7 +143,7 @@ {$com['statement_info'][0]['game_name']} {$com['statement_info'][0]['game_type_name']} - {$com['statement_info'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['statement_end_time']} + {$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']} {$com['statement_info'][0]['pay_amount']} @@ -188,7 +188,7 @@ {$it['game_name']} {$it['game_type_name']} - {$it['statement_begin_time']} ~ {$it['statement_end_time']} + {$it['statement_begin_time']} - {$it['statement_end_time']} {$it['pay_amount']}