diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index f83a57c60..fa419b6ac 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'] = "="; @@ -292,8 +292,8 @@ class CompanyStatementPoolController extends ThinkController unset($pl); foreach($infolist as $k=>&$v){ $v['statement_info'] = json_decode($v['statement_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['statement_money_exp'] = "="; @@ -372,8 +372,8 @@ class CompanyStatementPoolController extends ThinkController // foreach($infolist as $k=>&$v){ $v['statement_info'] = json_decode($v['statement_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['statement_money_exp'] = "="; diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 2081bbc63..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_"); @@ -1146,8 +1146,8 @@ class CompanyStatementSetController extends Controller { $pl = M("promote_company","tab_") ->alias('pc') ->field("p.account,p.company_relation,IFNULL(s.nickname,'admin') nickname") - ->join("left join (select company_id,account,company_relation from tab_promote where level = 1 group by company_id ) p on p.company_id = pc.id")//获取会长 - ->join("left join sys_member s on s.uid = pc.uid") + ->join("left join (select company_id,account,company_relation,admin_id from tab_promote where level = 1 group by company_id ) p on p.company_id = pc.id")//获取会长 + ->join("left join sys_member s on s.uid = p.admin_id") ->where("pc.id = {$company_id}") ->find(); $company = array_merge($company_info,$pl); diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html index 2f0f88287..2fe543ae5 100644 --- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewCpPool.html @@ -126,7 +126,7 @@ {$com.company_name} {$com.matche_platform} - {$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]['game_name']} {$com['statement_info'][0]['pay_amount']} @@ -145,7 +145,7 @@ - {$it['statement_begin_time']} ~ {$it['statement_end_time']} + {$it['statement_begin_time']} - {$it['statement_end_time']} {$it['game_name']} {$it['pay_amount']} {$it['pay_amount']} diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html index b8d1c2e5a..1821046e7 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html @@ -127,7 +127,7 @@ {$com.reward} {$com.statement_money} {$com.settlement_contact} - {$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.renark} @@ -140,7 +140,7 @@ {$it['increment_ratio']}% {$it['fax_ratio']}% {$it['d_statement_money']} - {$it['statement_begin_time']} ~ {$it['statement_end_time']} + {$it['statement_begin_time']} - {$it['statement_end_time']} 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']}