diff --git a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php index 4c0f77e4b..3146275f6 100644 --- a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php +++ b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php @@ -19,6 +19,8 @@ use app\common\lists\ListsExcelInterface; use app\common\lists\ListsSearchInterface; use app\common\model\cost_project\CostApprovedProject; + use app\common\model\financial\FinancialInvoice; + use app\common\model\financial\FinancialRefund; /** @@ -61,10 +63,15 @@ ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($data) { + $data['contract_type_text'] = $data->contract_type_text; $data['business_nature_text'] = $data->business_nature_text; $data['industry_nature_text'] = $data->industry_nature_text; $data['fund_sources_text'] = $data->fund_sources_text; $data['const_area_text'] = $data->const_area_text; + //开票金额 + $data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['id'])->sum('apply_amount'); + //到账金额 + $data['total_refund_amount'] = FinancialRefund::where('contract_id', $data['id'])->sum('amount'); }) ->toArray(); } diff --git a/app/adminapi/lists/financial/FinancialRefundLists.php b/app/adminapi/lists/financial/FinancialRefundLists.php index 81f580eac..56e2fba6e 100644 --- a/app/adminapi/lists/financial/FinancialRefundLists.php +++ b/app/adminapi/lists/financial/FinancialRefundLists.php @@ -41,7 +41,7 @@ { return [ '=' => ['contract_id', 'invoice_id'], - + '%like%' => ['create_user'] ]; } diff --git a/app/adminapi/logic/financial/FinancialInvoiceLogic.php b/app/adminapi/logic/financial/FinancialInvoiceLogic.php index 50c69ff42..c45b6f64d 100644 --- a/app/adminapi/logic/financial/FinancialInvoiceLogic.php +++ b/app/adminapi/logic/financial/FinancialInvoiceLogic.php @@ -134,14 +134,14 @@ public static function detail($params): array { $data = FinancialInvoice::withoutField('update_time,delete_time')->findOrEmpty($params['id']); - $contract = CostApprovedProject::field('contract_name,contract_type,part_a,part_b,money,create_time')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = CostApprovedProject::field('contract_name,contract_type,part_a,part_b,money,create_date')->where('id', $data['contract_id'])->findOrEmpty(); $data['invoice_type_text'] = $data->invoice_type_text; $data['contract_name'] = $contract['contract_name']; $data['contract_type'] = $contract->contract_type_text; $data['part_a'] = $contract['part_a']; $data['part_b'] = $contract['part_b']; $data['sign_money'] = $contract['money']; - $data['sign_time'] = $contract['create_time']; + $data['sign_time'] = $contract['create_date']; $data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['contract_id'])->sum('apply_amount'); $data['total_refund_amount'] = FinancialRefund::where('contract_id', $data['contract_id'])->sum('amount'); return $data->toArray();