From c2245ca67cfb51dfd3b2660b53c0b85be92a2f2e Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Fri, 19 Jan 2024 17:07:57 +0800 Subject: [PATCH] update --- app/adminapi/lists/project/ProjectLoanApplyLists.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/adminapi/lists/project/ProjectLoanApplyLists.php b/app/adminapi/lists/project/ProjectLoanApplyLists.php index 2d7f14e19..9369c3337 100644 --- a/app/adminapi/lists/project/ProjectLoanApplyLists.php +++ b/app/adminapi/lists/project/ProjectLoanApplyLists.php @@ -17,8 +17,11 @@ namespace app\adminapi\lists\project; use app\adminapi\lists\BaseAdminDataLists; use app\common\model\project\Project; +use app\common\model\project\ProjectExpenseReimbursement; use app\common\model\project\ProjectLoanApply; use app\common\lists\ListsSearchInterface; +use app\common\model\project\ProjectTravelReimbursement; +use app\common\model\project\ProjectTravelReimbursementDetail; /** @@ -64,7 +67,11 @@ class ProjectLoanApplyLists extends BaseAdminDataLists implements ListsSearchInt $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); $data['project_name'] = $project['name']; $data['project_code'] = $project['project_code']; - $data['has_return_amount'] = 0; + //差旅报销抵扣 + $trip_deduction = ProjectTravelReimbursement::where('loan_apply_id',$data['id'])->sum('offset_loan_amount'); + //费用报销抵扣 + $expense_deduction = ProjectExpenseReimbursement::where('loan_apply_id',$data['id'])->sum('offset_loan_amount'); + $data['has_return_amount'] = $trip_deduction + $expense_deduction; $data['not_return_amount'] = $data['loan_amount'] - $data['has_return_amount']; return $data; })