diff --git a/app/adminapi/controller/works/bgsp/OaApproveController.php b/app/adminapi/controller/works/bgsp/OaApproveController.php index 67bd6cdd5..d512509a4 100644 --- a/app/adminapi/controller/works/bgsp/OaApproveController.php +++ b/app/adminapi/controller/works/bgsp/OaApproveController.php @@ -462,7 +462,7 @@ 'content' => $params['content'], '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'); } else{ diff --git a/app/adminapi/controller/works/finance/ExpenseController.php b/app/adminapi/controller/works/finance/ExpenseController.php index 0624b790d..b20e7fccc 100644 --- a/app/adminapi/controller/works/finance/ExpenseController.php +++ b/app/adminapi/controller/works/finance/ExpenseController.php @@ -258,7 +258,13 @@ $data['check_status_text'] = match ($data['check_status']){ 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; })->toArray(); $count = Db::name('oa_expense')->where($where)->where('admin_id',$this->adminId)->count();