elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化结算页面时间显示

Browse Source
master
chenzhi 5 years ago
parent 0a049e0391
commit 0a136fbbde
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

20
Application/Admin/Controller/CompanyStatementController.class.php
Unescape Escape View File

@ -132,12 +132,12 @@ class CompanyStatementController extends ThinkController
->order("FIELD(verify_status,0,1,-1,2,3,-2,-3),id desc")->page($page,$row)->select(); ->order("FIELD(verify_status,0,1,-1,2,3,-2,-3),id desc")->page($page,$row)->select();
foreach($data as $k => &$v) { foreach($data as $k => &$v) {
$v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_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']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
$v['company_belong'] = $this->CompanyBelong[$v['company_belong']]; $v['company_belong'] = $this->CompanyBelong[$v['company_belong']];
$v['op_time'] = date('Y-m-d H:i:s',$v['op_time']); $v['op_time'] = date('Y.m.d H:i:s',$v['op_time']);
$v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}"; $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}";
$v['withdraw_type_1'] = ($v['withdraw_type'] == 1 ? "月结" :"周结"); $v['withdraw_type_1'] = ($v['withdraw_type'] == 1 ? "月结" :"周结");
@ -282,7 +282,7 @@ class CompanyStatementController extends ThinkController
$y = M("CompanyStatement", "tab_")->where("id='{$params['id']}'")->find(); $y = M("CompanyStatement", "tab_")->where("id='{$params['id']}'")->find();
if($y['first_party_info'] != $params['first_party_info'] || $y['second_party_info'] != $params['second_party_info'] || $y['statement_info'] != $params['statement_info']){ if($y['first_party_info'] != $params['first_party_info'] || $y['second_party_info'] != $params['second_party_info'] || $y['statement_info'] != $params['statement_info']){
$params['verify_status'] = 0; $params['verify_status'] = 0;
$params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); $params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s")]);
$params['op_time'] = time(); $params['op_time'] = time();
M("CompanyStatement","tab_")->save($params); M("CompanyStatement","tab_")->save($params);
} }
@ -342,7 +342,7 @@ class CompanyStatementController extends ThinkController
if($v['confirm_status'] != 0) continue; if($v['confirm_status'] != 0) continue;
$v['confirm_log'] = json_decode($v['confirm_log'],true); $v['confirm_log'] = json_decode($v['confirm_log'],true);
$v['confirm_log']['launch_user']=$this->admininfo["username"]; $v['confirm_log']['launch_user']=$this->admininfo["username"];
$v['confirm_log']['launch_time']=date("Y-m-d H:i:s"); $v['confirm_log']['launch_time']=date("Y.m.d H:i:s");
$v['confirm_log'] = json_encode($v['confirm_log']); $v['confirm_log'] = json_encode($v['confirm_log']);
$v['confirm_status']=1; $v['confirm_status']=1;
// $v['op_time'] = time(); // $v['op_time'] = time();
@ -364,7 +364,7 @@ class CompanyStatementController extends ThinkController
if($v['verify_status'] != $old_status) continue; if($v['verify_status'] != $old_status) continue;
$v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log'] = json_decode($v['verify_log'],true);
$v['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; $v['verify_log'][$op_pre.'_user']=$this->admininfo["username"];
$v['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); $v['verify_log'][$op_pre.'_time']=date("Y.m.d H:i:s");
$v['verify_log'] = json_encode($v['verify_log']); $v['verify_log'] = json_encode($v['verify_log']);
$v['verify_status']=$change_status; $v['verify_status']=$change_status;
$v['op_time'] = time(); $v['op_time'] = time();
@ -484,7 +484,7 @@ class CompanyStatementController extends ThinkController
"fine"=>0, "fine"=>0,
"reward"=>0, "reward"=>0,
"verify_status"=>0, "verify_status"=>0,
"verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]), "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s")]),
"op_time"=>time(), "op_time"=>time(),
"company_list"=>[] "company_list"=>[]
]; ];
@ -534,7 +534,7 @@ class CompanyStatementController extends ThinkController
if($v['statement_money'] == 0){ if($v['statement_money'] == 0){
$v['verify_status'] = 5; $v['verify_status'] = 5;
$v['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); $v['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y.m.d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y.m.d H:i:s")]);
} }
//判断周月结 //判断周月结
if(($v["statement_end_time"]-$v['statement_begin_time']) > 7*24*3600){ if(($v["statement_end_time"]-$v['statement_begin_time']) > 7*24*3600){
@ -568,7 +568,7 @@ class CompanyStatementController extends ThinkController
if($v['verify_status'] != $old_status) continue; if($v['verify_status'] != $old_status) continue;
$v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log'] = json_decode($v['verify_log'],true);
$v['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; $v['verify_log'][$op_pre.'_user']=$this->admininfo["username"];
$v['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); $v['verify_log'][$op_pre.'_time']=date("Y.m.d H:i:s");
$v['verify_log'][$op_pre.'_num']=$num; $v['verify_log'][$op_pre.'_num']=$num;
$v['verify_log'] = json_encode($v['verify_log']); $v['verify_log'] = json_encode($v['verify_log']);
$v['verify_status']=$change_status; $v['verify_status']=$change_status;

8
Application/Admin/Controller/CompanyStatementLackController.class.php
Unescape Escape View File

@ -75,11 +75,11 @@ class CompanyStatementLackController extends ThinkController
foreach($data as $k => &$v) { foreach($data as $k => &$v) {
$v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_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']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
$v['is_payment_str'] = $this->IsPayment[$v['is_payment']]; $v['is_payment_str'] = $this->IsPayment[$v['is_payment']];
$v['company_type_str'] = $this->CompanyType[$v['company_type']]; $v['company_type_str'] = $this->CompanyType[$v['company_type']];
$v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}"; $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}";
$v['oplist'] = $this->OpAuth($v); $v['oplist'] = $this->OpAuth($v);
} }
@ -146,7 +146,7 @@ class CompanyStatementLackController extends ThinkController
"fine"=>0, "fine"=>0,
"reward"=>0, "reward"=>0,
"verify_status"=>0, "verify_status"=>0,
"verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]), "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s")]),
"op_time"=>time(), "op_time"=>time(),
"company_list"=>[] "company_list"=>[]
]; ];

14
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -113,8 +113,8 @@ class CompanyStatementPoolController extends ThinkController
->page($page,$row)->select(); ->page($page,$row)->select();
foreach($data as $k => &$v) { foreach($data as $k => &$v) {
$v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_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']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
$v['company_type_str'] = $this->CompanyType[$v['company_type']]; $v['company_type_str'] = $this->CompanyType[$v['company_type']];
$v['is_payment_str'] = $this->IsPayment[$v['is_payment']]; $v['is_payment_str'] = $this->IsPayment[$v['is_payment']];
@ -123,8 +123,8 @@ class CompanyStatementPoolController extends ThinkController
$v['can_export'] = 1; $v['can_export'] = 1;
} }
$v['op_time'] = date('Y-m-d H:i:s',$v['op_time']); $v['op_time'] = date('Y.m.d H:i:s',$v['op_time']);
$v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}"; $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}";
$v['ext_file_type'] = empty($v['ext_file']) ? "无" : "有"; $v['ext_file_type'] = empty($v['ext_file']) ? "无" : "有";
$v['withdraw_type'] = $this->WithdrawType[$v['withdraw_type']];; $v['withdraw_type'] = $this->WithdrawType[$v['withdraw_type']];;
@ -465,7 +465,7 @@ class CompanyStatementPoolController extends ThinkController
if($v['verify_status'] != $old_status) continue; if($v['verify_status'] != $old_status) continue;
$v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log'] = json_decode($v['verify_log'],true);
$v['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; $v['verify_log'][$op_pre.'_user']=$this->admininfo["username"];
$v['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); $v['verify_log'][$op_pre.'_time']=date("Y.m.d H:i:s");
$v['verify_log'] = json_encode($v['verify_log']); $v['verify_log'] = json_encode($v['verify_log']);
$v['verify_status']=$change_status; $v['verify_status']=$change_status;
$this->DBModel->save($v); $this->DBModel->save($v);
@ -483,7 +483,7 @@ class CompanyStatementPoolController extends ThinkController
$dbres = $this->DBModel->field("id,verify_status,verify_log")->where("id = {$id}")->find(); $dbres = $this->DBModel->field("id,verify_status,verify_log")->where("id = {$id}")->find();
$dbres['verify_log'] = json_decode($dbres['verify_log'],true); $dbres['verify_log'] = json_decode($dbres['verify_log'],true);
$dbres['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; $dbres['verify_log'][$op_pre.'_user']=$this->admininfo["username"];
$dbres['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); $dbres['verify_log'][$op_pre.'_time']=date("Y.m.d H:i:s");
$dbres['verify_log'] = json_encode($dbres['verify_log']); $dbres['verify_log'] = json_encode($dbres['verify_log']);
$dbres['verify_status']=$change_status; $dbres['verify_status']=$change_status;
$this->DBModel->save($dbres); $this->DBModel->save($dbres);
@ -854,7 +854,7 @@ class CompanyStatementPoolController extends ThinkController
foreach($st_res as $k=>&$v){ foreach($st_res as $k=>&$v){
$v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log'] = json_decode($v['verify_log'],true);
$v['verify_log']['pool_user']=$this->admininfo["username"]; $v['verify_log']['pool_user']=$this->admininfo["username"];
$v['verify_log']['pool_time']=date("Y-m-d H:i:s"); $v['verify_log']['pool_time']=date("Y.m.d H:i:s");
$v['verify_log'] = json_encode($v['verify_log']); $v['verify_log'] = json_encode($v['verify_log']);
$v['verify_status']=-3; $v['verify_status']=-3;
$stres = M("company_statement","tab_")->save($v); $stres = M("company_statement","tab_")->save($v);

Write Preview
Loading…
Cancel
Save