Merge branch 'feature/add_item' into feature/add_item_release

master
zhengyongxing 4 years ago
commit 88dfe72d28

@ -1010,8 +1010,8 @@ class AggregateFinanceStatementController extends ThinkController
unset($v['company_list']); unset($v['company_list']);
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){

Loading…
Cancel
Save