mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-05-27 14:26:26 +08:00
parent 291c1fd189
commit 9f25bbd29c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/works/bgsp/OaApproveController.php
View File

@ -462,7 +462,7 @@
'content' => $params['content'], 'content' => $params['content'],
'create_time' => time() 'create_time' => time()
); );
Db::name('FlowRecord')->strict(false)->field(true)->insertGetId($checkData); Db::name('oa_flow_record')->strict(false)->field(true)->insertGetId($checkData);
return $this->success('ok'); return $this->success('ok');
} }
else{ else{

8
app/adminapi/controller/works/finance/ExpenseController.php
View File

@ -258,7 +258,13 @@
$data['check_status_text'] = match ($data['check_status']){ $data['check_status_text'] = match ($data['check_status']){
0=>'待审核',1=>'审核中',2=>'审核通过',3=>'审核不通过',4=>'撤销审核' 0=>'待审核',1=>'审核中',2=>'审核通过',3=>'审核不通过',4=>'撤销审核'
}; };
if(!empty($data['pay_admin_id']) && !empty()){} if(!empty($data['pay_admin_id']) && !empty($data['pay_time']) && $data['check_status'] == 2){
$data['check_status_text'] = '已打款';
}
$data['total_amount'] = 0;
foreach (json_decode($data['detail'],true) as $v){
$data['total_amount'] += $v['amount'];
}
return $data; return $data;
})->toArray(); })->toArray();
$count = Db::name('oa_expense')->where($where)->where('admin_id',$this->adminId)->count(); $count = Db::name('oa_expense')->where($where)->where('admin_id',$this->adminId)->count();