From 905d518cd0b111d10ef7a10926e10ee517188310 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Sat, 6 Apr 2024 11:39:32 +0800 Subject: [PATCH] update --- .../cost_project/CostApprovedProjectController.php | 2 ++ .../lists/financial/FinancialBudgetDocLists.php | 14 ++++++++------ .../FinancialDepartmentIncomeSettlementLists.php | 6 +++--- .../FinancialExpenseReimbursementLists.php | 4 ++-- .../lists/financial/FinancialInvoiceLists.php | 12 +++++++----- .../lists/financial/FinancialRefundLists.php | 10 ++++++---- .../lists/financial/FinancialSettlementLists.php | 2 +- .../lists/financial/FinancialUsingFundsLists.php | 6 +++--- .../lists/zjzx_finance/ZjzxSettlementLists.php | 2 +- .../logic/financial/FinancialBudgetDocLogic.php | 14 ++++++++------ .../FinancialDepartmentIncomeSettlementLogic.php | 14 ++++++++------ .../FinancialExpenseReimbursementLogic.php | 4 ++-- .../logic/financial/FinancialInvoiceLogic.php | 14 ++++++++------ .../logic/financial/FinancialRefundLogic.php | 12 +++++++----- .../logic/financial/FinancialSettlementLogic.php | 12 +++++++----- .../logic/financial/FinancialUsingFundsLogic.php | 6 +++--- .../logic/zjzx_finance/ZjzxSettlementLogic.php | 2 +- .../financial/FinancialBudgetDocValidate.php | 4 ++-- .../FinancialExpenseReimbursementValidate.php | 4 ++-- .../financial/FinancialInvoiceValidate.php | 4 ++-- .../validate/financial/FinancialRefundValidate.php | 4 ++-- .../financial/FinancialSettlementValidate.php | 4 ++-- .../financial/FinancialUsingFundsValidate.php | 4 ++-- 23 files changed, 89 insertions(+), 71 deletions(-) diff --git a/app/adminapi/controller/cost_project/CostApprovedProjectController.php b/app/adminapi/controller/cost_project/CostApprovedProjectController.php index fb2f1db9a..d6b03dd6d 100644 --- a/app/adminapi/controller/cost_project/CostApprovedProjectController.php +++ b/app/adminapi/controller/cost_project/CostApprovedProjectController.php @@ -79,6 +79,8 @@ $dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty(); $data['part_a_name'] = $custom['name']; $data['signed_dept_name'] = $dept['name']; + $data['contract_type_text'] = $data->contract_type_text; + $data['business_nature_text'] = $data->business_nature_text; $invoice_ids = FinancialInvoice::where('contract_id', $data['id'])->column('id'); //开票金额 $data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['id'])->sum('apply_amount'); diff --git a/app/adminapi/lists/financial/FinancialBudgetDocLists.php b/app/adminapi/lists/financial/FinancialBudgetDocLists.php index 6a75bb02b..d15d39738 100644 --- a/app/adminapi/lists/financial/FinancialBudgetDocLists.php +++ b/app/adminapi/lists/financial/FinancialBudgetDocLists.php @@ -17,9 +17,10 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialBudgetDoc; use app\common\model\financial\FinancialBudgetDocDetail; + use app\common\model\marketing\MarketingContract; + use app\common\model\marketing\MarketingCustom; /** @@ -63,13 +64,14 @@ ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($data) { - $contract = CostApprovedProject::field('contract_name,part_a,create_date,money,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,part_a,create_time,signed_amount,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $data['contract_name'] = $contract['contract_name']; - $data['part_a'] = $contract['part_a']; - $data['create_date'] = $contract['create_date']; - $data['money'] = $contract['money']; + $data['part_a'] = $custom['name']; + $data['create_date'] = $contract['create_time']; + $data['money'] = $contract['signed_amount']; $data['contract_type'] = $contract['contract_type']; - $data['contract_type_text'] = $contract->contract_type_text; + $data['contract_type_text'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['total_amount'] = FinancialBudgetDocDetail::where('budget_doc_id', $data['id'])->sum('amount'); }) ->toArray(); diff --git a/app/adminapi/lists/financial/FinancialDepartmentIncomeSettlementLists.php b/app/adminapi/lists/financial/FinancialDepartmentIncomeSettlementLists.php index 7be8af6e6..a09168d6d 100644 --- a/app/adminapi/lists/financial/FinancialDepartmentIncomeSettlementLists.php +++ b/app/adminapi/lists/financial/FinancialDepartmentIncomeSettlementLists.php @@ -17,10 +17,10 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialBudgetDoc; use app\common\model\financial\FinancialDepartmentIncomeSettlement; use app\common\model\financial\FinancialDepartmentIncomeSettlementDetail; + use app\common\model\marketing\MarketingContract; /** @@ -73,11 +73,11 @@ ->order(['id' => 'desc']) ->select()->each(function ($data) { $budget_doc = FinancialBudgetDoc::field('contract_id,code,name,issue_date')->where('id', $data['budget_doc_id'])->findOrEmpty(); - $contract = CostApprovedProject::field('contract_name,money')->where('id', $budget_doc['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,signed_amount')->where('id', $budget_doc['contract_id'])->findOrEmpty(); $data['budget_doc_code'] = $budget_doc['code']; $data['budget_doc_name'] = $budget_doc['name']; $data['contract_name'] = $contract['contract_name']; - $data['contract_money'] = $contract['money']; + $data['contract_money'] = $contract['signed_amount']; $data['issue_date'] = $budget_doc['issue_date']; $data['amount'] = FinancialDepartmentIncomeSettlementDetail::where('department_income_settlement_id', $data['id'])->sum('amount'); $data['settlement_amount'] = FinancialDepartmentIncomeSettlementDetail::where('department_income_settlement_id', $data['id'])->sum('settlement_amount'); diff --git a/app/adminapi/lists/financial/FinancialExpenseReimbursementLists.php b/app/adminapi/lists/financial/FinancialExpenseReimbursementLists.php index ceaee6aa7..b849395d1 100644 --- a/app/adminapi/lists/financial/FinancialExpenseReimbursementLists.php +++ b/app/adminapi/lists/financial/FinancialExpenseReimbursementLists.php @@ -17,10 +17,10 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialExpenseReimbursement; use app\common\model\financial\FinancialExpenseReimbursementDetail; use app\common\model\financial\FinancialFeeApplication; + use app\common\model\marketing\MarketingContract; /** @@ -70,7 +70,7 @@ ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($data) { - $contract = CostApprovedProject::field('contract_name,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); $fee_application = FinancialFeeApplication::field('theme')->where('id', $data['fee_application_id'])->findOrEmpty(); $data['contract_name'] = !$contract->isEmpty() ? $contract['contract_name'] : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract['contract_type'] : 0; diff --git a/app/adminapi/lists/financial/FinancialInvoiceLists.php b/app/adminapi/lists/financial/FinancialInvoiceLists.php index 7ddb3d5c8..5c0fd94ca 100644 --- a/app/adminapi/lists/financial/FinancialInvoiceLists.php +++ b/app/adminapi/lists/financial/FinancialInvoiceLists.php @@ -17,9 +17,10 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; + use app\common\model\marketing\MarketingContract; + use app\common\model\marketing\MarketingCustom; /** @@ -63,12 +64,13 @@ ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($data) { - $contract = CostApprovedProject::field('contract_name,contract_type,part_a,part_b,money,create_time')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,create_time')->where('id', $data['contract_id'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $data['contract_name'] = $contract['contract_name']; - $data['contract_type'] = $contract->contract_type_text; - $data['part_a'] = $contract['part_a']; + $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; + $data['part_a'] = $custom['name']; $data['part_b'] = $contract['part_b']; - $data['sign_money'] = $contract['money']; + $data['sign_money'] = $contract['signed_amount']; $data['sign_time'] = $contract['create_time']; $data['invoice_type_text'] = $data->invoice_type_text; $refund = FinancialRefund::where('invoice_id', $data['id'])->findOrEmpty(); diff --git a/app/adminapi/lists/financial/FinancialRefundLists.php b/app/adminapi/lists/financial/FinancialRefundLists.php index 56e2fba6e..b35d3069e 100644 --- a/app/adminapi/lists/financial/FinancialRefundLists.php +++ b/app/adminapi/lists/financial/FinancialRefundLists.php @@ -17,9 +17,10 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; + use app\common\model\marketing\MarketingContract; + use app\common\model\marketing\MarketingCustom; /** @@ -62,11 +63,12 @@ ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($data) { - $contract = CostApprovedProject::field('contract_name,contract_type,part_a,part_b')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,contract_type,part_a,part_b')->where('id', $data['contract_id'])->findOrEmpty(); $invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $data['contract_name'] = $contract['contract_name']; - $data['contract_type'] = $contract->contract_type_text; - $data['part_a'] = $contract['part_a']; + $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; + $data['part_a'] = $custom['name']; $data['part_b'] = $contract['part_b']; $data['invoice_code'] = $invoice['invoice_code']; $data['apply_amount'] = $invoice['apply_amount']; diff --git a/app/adminapi/lists/financial/FinancialSettlementLists.php b/app/adminapi/lists/financial/FinancialSettlementLists.php index 359694633..05f592a52 100644 --- a/app/adminapi/lists/financial/FinancialSettlementLists.php +++ b/app/adminapi/lists/financial/FinancialSettlementLists.php @@ -67,7 +67,7 @@ $custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty(); $data['invoice_type_text'] = $data->invoice_type_text; $data['contract_name'] = $contract['contract_name']; - $data['contract_type'] = $contract->contract_type_text; + $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['part_a'] = $custom['name']; $data['part_b'] = $contract['part_b']; $data['sign_money'] = $contract['signed_amount']; diff --git a/app/adminapi/lists/financial/FinancialUsingFundsLists.php b/app/adminapi/lists/financial/FinancialUsingFundsLists.php index b58330c2b..43ae63b39 100644 --- a/app/adminapi/lists/financial/FinancialUsingFundsLists.php +++ b/app/adminapi/lists/financial/FinancialUsingFundsLists.php @@ -17,9 +17,9 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsSearchInterface; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\dept\Dept; use app\common\model\financial\FinancialUsingFunds; + use app\common\model\marketing\MarketingContract; /** @@ -68,10 +68,10 @@ ->order(['id' => 'desc']) ->select()->each(function ($data) { $dept = Dept::field('name')->where('id', $data['approve_dept'])->findOrEmpty(); - $contract = CostApprovedProject::field('contract_name,money')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,signed_amount')->where('id', $data['contract_id'])->findOrEmpty(); $data['approve_dept_name'] = $dept['name']; $data['contract_name'] = !$contract->isEmpty() ? $contract['contract_name'] : ''; - $data['contract_money'] = !$contract->isEmpty() ? $contract['money'] : ''; + $data['contract_money'] = !$contract->isEmpty() ? $contract['signed_amount'] : ''; $data['pay_type_text'] = $data->pay_type_text; $data['cost_type_text'] = $data->cost_type_text; }) diff --git a/app/adminapi/lists/zjzx_finance/ZjzxSettlementLists.php b/app/adminapi/lists/zjzx_finance/ZjzxSettlementLists.php index 405a6c201..e9877a6d1 100644 --- a/app/adminapi/lists/zjzx_finance/ZjzxSettlementLists.php +++ b/app/adminapi/lists/zjzx_finance/ZjzxSettlementLists.php @@ -58,7 +58,7 @@ $data['project_num'] = $project['project_num']; $data['project_name'] = $project['project_name']; $data['contract_name'] = $contract['contract_name']; - $data['contract_type'] = $contract->contract_type_text; + $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['part_a'] = $part_a['name']; $data['part_b'] = $contract['part_b']; $data['sign_money'] = $contract['signed_amount']; diff --git a/app/adminapi/logic/financial/FinancialBudgetDocLogic.php b/app/adminapi/logic/financial/FinancialBudgetDocLogic.php index 016b28c6e..b01804916 100644 --- a/app/adminapi/logic/financial/FinancialBudgetDocLogic.php +++ b/app/adminapi/logic/financial/FinancialBudgetDocLogic.php @@ -16,9 +16,10 @@ use app\common\logic\BaseLogic; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialBudgetDoc; use app\common\model\financial\FinancialBudgetDocDetail; + use app\common\model\marketing\MarketingContract; + use app\common\model\marketing\MarketingCustom; use think\facade\Db; @@ -154,13 +155,14 @@ public static function detail($params): array { $data = FinancialBudgetDoc::withoutField('update_time,delete_time')->findOrEmpty($params['id']); - $contract = CostApprovedProject::field('contract_name,part_a,create_date,money,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,part_a,create_time,signed_amount,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $data['contract_name'] = $contract['contract_name']; - $data['part_a'] = $contract['part_a']; - $data['create_date'] = $contract['create_date']; - $data['money'] = $contract['money']; + $data['part_a'] = $custom['name']; + $data['create_date'] = $contract['create_time']; + $data['money'] = $contract['signed_amount']; $data['contract_type'] = $contract['contract_type']; - $data['contract_type_text'] = $contract->contract_type_text; + $data['contract_type_text'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; return $data->toArray(); } diff --git a/app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php b/app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php index e6012259d..3e9bff0c9 100644 --- a/app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php +++ b/app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php @@ -16,10 +16,11 @@ use app\common\logic\BaseLogic; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialBudgetDoc; use app\common\model\financial\FinancialDepartmentIncomeSettlement; use app\common\model\financial\FinancialDepartmentIncomeSettlementDetail; + use app\common\model\marketing\MarketingContract; + use app\common\model\marketing\MarketingCustom; use think\facade\Db; @@ -155,16 +156,17 @@ { $data = FinancialDepartmentIncomeSettlement::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $budget_doc = FinancialBudgetDoc::field('contract_id,code,name,issue_date')->where('id', $data['budget_doc_id'])->findOrEmpty(); - $contract = CostApprovedProject::field('contract_name,part_a,create_date,money,contract_type')->where('id', $budget_doc['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,part_a,create_time,signed_amount,contract_type')->where('id', $budget_doc['contract_id'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $data['code'] = $budget_doc['code']; $data['name'] = $budget_doc['name']; $data['issue_date'] = $budget_doc['issue_date']; $data['contract_name'] = $contract['contract_name']; - $data['part_a'] = $contract['part_a']; - $data['create_date'] = $contract['create_date']; - $data['money'] = $contract['money']; + $data['part_a'] = $custom['name']; + $data['create_date'] = $contract['create_time']; + $data['money'] = $contract['signed_amount']; $data['contract_type'] = (string)$contract['contract_type']; - $data['contract_type_text'] = $contract->contract_type_text; + $data['contract_type_text'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; return $data->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/financial/FinancialExpenseReimbursementLogic.php b/app/adminapi/logic/financial/FinancialExpenseReimbursementLogic.php index 33086fc1f..660219971 100644 --- a/app/adminapi/logic/financial/FinancialExpenseReimbursementLogic.php +++ b/app/adminapi/logic/financial/FinancialExpenseReimbursementLogic.php @@ -16,10 +16,10 @@ use app\common\logic\BaseLogic; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialExpenseReimbursement; use app\common\model\financial\FinancialExpenseReimbursementDetail; use app\common\model\financial\FinancialFeeApplication; + use app\common\model\marketing\MarketingContract; use think\facade\Db; @@ -162,7 +162,7 @@ public static function detail($params): array { $data = FinancialExpenseReimbursement::withoutField('update_time,delete_time')->findOrEmpty($params['id']); - $contract = CostApprovedProject::field('contract_name,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,contract_type')->where('id', $data['contract_id'])->findOrEmpty(); $fee_application = FinancialFeeApplication::field('theme')->where('id', $data['fee_application_id'])->findOrEmpty(); $data['contract_name'] = !$contract->isEmpty() ? $contract['contract_name'] : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract['contract_type'] : 0; diff --git a/app/adminapi/logic/financial/FinancialInvoiceLogic.php b/app/adminapi/logic/financial/FinancialInvoiceLogic.php index c45b6f64d..3d1f1dea8 100644 --- a/app/adminapi/logic/financial/FinancialInvoiceLogic.php +++ b/app/adminapi/logic/financial/FinancialInvoiceLogic.php @@ -16,9 +16,10 @@ use app\common\logic\BaseLogic; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; + use app\common\model\marketing\MarketingContract; + use app\common\model\marketing\MarketingCustom; use think\facade\Db; @@ -134,14 +135,15 @@ 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_date')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,create_time')->where('id', $data['contract_id'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', 'part_a')->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['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; + $data['part_a'] = $custom['name']; $data['part_b'] = $contract['part_b']; - $data['sign_money'] = $contract['money']; - $data['sign_time'] = $contract['create_date']; + $data['sign_money'] = $contract['signed_amount']; + $data['sign_time'] = $contract['create_time']; $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(); diff --git a/app/adminapi/logic/financial/FinancialRefundLogic.php b/app/adminapi/logic/financial/FinancialRefundLogic.php index c6e998cd4..9c92fe9a8 100644 --- a/app/adminapi/logic/financial/FinancialRefundLogic.php +++ b/app/adminapi/logic/financial/FinancialRefundLogic.php @@ -16,9 +16,10 @@ use app\common\logic\BaseLogic; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; + use app\common\model\marketing\MarketingContract; + use app\common\model\marketing\MarketingCustom; use think\facade\Db; @@ -117,13 +118,14 @@ public static function detail($params): array { $data = FinancialRefund::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 = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,create_time')->where('id', $data['contract_id'])->findOrEmpty(); $invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $data['contract_name'] = $contract['contract_name']; - $data['contract_type'] = $contract->contract_type_text; - $data['part_a'] = $contract['part_a']; + $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; + $data['part_a'] = $custom['name']; $data['part_b'] = $contract['part_b']; - $data['sign_money'] = $contract['money']; + $data['sign_money'] = $contract['signed_amount']; $data['sign_time'] = $contract['create_time']; $data['invoice_code'] = $invoice['invoice_code']; $data['apply_amount'] = $invoice['apply_amount']; diff --git a/app/adminapi/logic/financial/FinancialSettlementLogic.php b/app/adminapi/logic/financial/FinancialSettlementLogic.php index c2c09c6a7..9ca2755b1 100644 --- a/app/adminapi/logic/financial/FinancialSettlementLogic.php +++ b/app/adminapi/logic/financial/FinancialSettlementLogic.php @@ -16,10 +16,11 @@ use app\common\logic\BaseLogic; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; use app\common\model\financial\FinancialSettlement; + use app\common\model\marketing\MarketingContract; + use app\common\model\marketing\MarketingCustom; use think\facade\Db; @@ -113,13 +114,14 @@ public static function detail($params): array { $data = FinancialSettlement::withoutField('create_time,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 = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,create_time')->where('id', $data['contract_id'])->findOrEmpty(); + $custom = MarketingCustom::field('name')->where('id', 'part_a')->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['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; + $data['part_a'] = $custom['name']; $data['part_b'] = $contract['part_b']; - $data['sign_money'] = $contract['money']; + $data['sign_money'] = $contract['signed_amount']; $data['sign_time'] = $contract['create_time']; $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'); diff --git a/app/adminapi/logic/financial/FinancialUsingFundsLogic.php b/app/adminapi/logic/financial/FinancialUsingFundsLogic.php index 4118a7aea..896ba2813 100644 --- a/app/adminapi/logic/financial/FinancialUsingFundsLogic.php +++ b/app/adminapi/logic/financial/FinancialUsingFundsLogic.php @@ -16,12 +16,12 @@ use app\common\logic\BaseLogic; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\dept\Dept; use app\common\model\financial\FinancialUsingFunds; use app\common\model\financial\FinancialUsingFundsDetail; use app\common\model\GeoCity; use app\common\model\GeoProvince; + use app\common\model\marketing\MarketingContract; use think\facade\Db; @@ -184,12 +184,12 @@ { $data = FinancialUsingFunds::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $dept = Dept::field('name')->where('id', $data['approve_dept'])->findOrEmpty(); - $contract = CostApprovedProject::field('contract_name,money')->where('id', $data['contract_id'])->findOrEmpty(); + $contract = MarketingContract::field('contract_name,signed_amount')->where('id', $data['contract_id'])->findOrEmpty(); $province = GeoProvince::field('province_name')->where('province_code', $data['province'])->findOrEmpty(); $city = GeoCity::field('city_name')->where('city_code', $data['city'])->findOrEmpty(); $data['approve_dept_name'] = $dept['name']; $data['contract_name'] = !$contract->isEmpty() ? $contract['contract_name'] : ''; - $data['contract_money'] = !$contract->isEmpty() ? $contract['money'] : ''; + $data['contract_money'] = !$contract->isEmpty() ? $contract['signed_amount'] : ''; $data['province_name'] = !$province->isEmpty() ? $province['province_name'] : ''; $data['city_name'] = !$city->isEmpty() ? $city['city_name'] : ''; $data['pay_type_text'] = $data->pay_type_text; diff --git a/app/adminapi/logic/zjzx_finance/ZjzxSettlementLogic.php b/app/adminapi/logic/zjzx_finance/ZjzxSettlementLogic.php index c5ecff71b..2a4b7be59 100644 --- a/app/adminapi/logic/zjzx_finance/ZjzxSettlementLogic.php +++ b/app/adminapi/logic/zjzx_finance/ZjzxSettlementLogic.php @@ -107,7 +107,7 @@ $data['project_num'] = $project['project_num']; $data['project_name'] = $project['project_name']; $data['contract_name'] = $contract['contract_name']; - $data['contract_type'] = $contract->contract_type_text; + $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['part_a'] = $part_a['name']; $data['part_b'] = $contract['part_b']; $data['sign_money'] = $contract['signed_amount']; diff --git a/app/adminapi/validate/financial/FinancialBudgetDocValidate.php b/app/adminapi/validate/financial/FinancialBudgetDocValidate.php index 2c7563a6c..835d2d6ee 100644 --- a/app/adminapi/validate/financial/FinancialBudgetDocValidate.php +++ b/app/adminapi/validate/financial/FinancialBudgetDocValidate.php @@ -15,11 +15,11 @@ namespace app\adminapi\validate\financial; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\dept\Dept; use app\common\model\dict\DictData; use app\common\model\financial\FinancialBudgetDoc; use app\common\model\financial\FinancialBudgetDocDetail; + use app\common\model\marketing\MarketingContract; use app\common\validate\BaseValidate; @@ -117,7 +117,7 @@ public function checkContract($value): bool|string { - $data = CostApprovedProject::where('id', $value)->findOrEmpty(); + $data = MarketingContract::where('id', $value)->findOrEmpty(); return $data->isEmpty() ? '合同信息不存在' : true; } diff --git a/app/adminapi/validate/financial/FinancialExpenseReimbursementValidate.php b/app/adminapi/validate/financial/FinancialExpenseReimbursementValidate.php index e3551c411..369f32c30 100644 --- a/app/adminapi/validate/financial/FinancialExpenseReimbursementValidate.php +++ b/app/adminapi/validate/financial/FinancialExpenseReimbursementValidate.php @@ -15,12 +15,12 @@ namespace app\adminapi\validate\financial; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\dept\Dept; use app\common\model\dict\DictData; use app\common\model\financial\FinancialExpenseReimbursement; use app\common\model\financial\FinancialExpenseReimbursementDetail; use app\common\model\financial\FinancialFeeApplication; + use app\common\model\marketing\MarketingContract; use app\common\validate\BaseValidate; @@ -124,7 +124,7 @@ public function checkContract($value): bool|string { if (empty($value)) return true; - $data = CostApprovedProject::where('id', $value)->findOrEmpty(); + $data = MarketingContract::where('id', $value)->findOrEmpty(); return $data->isEmpty() ? '合同信息不存在' : true; } diff --git a/app/adminapi/validate/financial/FinancialInvoiceValidate.php b/app/adminapi/validate/financial/FinancialInvoiceValidate.php index ab1176dc9..3f4f9b7ed 100644 --- a/app/adminapi/validate/financial/FinancialInvoiceValidate.php +++ b/app/adminapi/validate/financial/FinancialInvoiceValidate.php @@ -15,9 +15,9 @@ namespace app\adminapi\validate\financial; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\dict\DictData; use app\common\model\financial\FinancialInvoice; + use app\common\model\marketing\MarketingContract; use app\common\validate\BaseValidate; @@ -127,7 +127,7 @@ public function checkContract($value): bool|string { - $data = CostApprovedProject::where('id', $value)->findOrEmpty(); + $data = MarketingContract::where('id', $value)->findOrEmpty(); return $data->isEmpty() ? '合同信息不存在' : true; } diff --git a/app/adminapi/validate/financial/FinancialRefundValidate.php b/app/adminapi/validate/financial/FinancialRefundValidate.php index d9bb93b93..2c1e159ed 100644 --- a/app/adminapi/validate/financial/FinancialRefundValidate.php +++ b/app/adminapi/validate/financial/FinancialRefundValidate.php @@ -15,9 +15,9 @@ namespace app\adminapi\validate\financial; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; + use app\common\model\marketing\MarketingContract; use app\common\validate\BaseValidate; @@ -116,7 +116,7 @@ public function checkContract($value): bool|string { - $data = CostApprovedProject::where('id', $value)->findOrEmpty(); + $data = MarketingContract::where('id', $value)->findOrEmpty(); return $data->isEmpty() ? '合同信息不存在' : true; } diff --git a/app/adminapi/validate/financial/FinancialSettlementValidate.php b/app/adminapi/validate/financial/FinancialSettlementValidate.php index 3ab82043f..eec230f24 100644 --- a/app/adminapi/validate/financial/FinancialSettlementValidate.php +++ b/app/adminapi/validate/financial/FinancialSettlementValidate.php @@ -15,8 +15,8 @@ namespace app\adminapi\validate\financial; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\financial\FinancialSettlement; + use app\common\model\marketing\MarketingContract; use app\common\validate\BaseValidate; @@ -112,7 +112,7 @@ public function checkContract($value): bool|string { - $data = CostApprovedProject::where('id', $value)->findOrEmpty(); + $data = MarketingContract::where('id', $value)->findOrEmpty(); return $data->isEmpty() ? '合同信息不存在' : true; } diff --git a/app/adminapi/validate/financial/FinancialUsingFundsValidate.php b/app/adminapi/validate/financial/FinancialUsingFundsValidate.php index 233d0839d..2ba49b977 100644 --- a/app/adminapi/validate/financial/FinancialUsingFundsValidate.php +++ b/app/adminapi/validate/financial/FinancialUsingFundsValidate.php @@ -15,11 +15,11 @@ namespace app\adminapi\validate\financial; - use app\common\model\cost_project\CostApprovedProject; use app\common\model\dept\Dept; use app\common\model\dict\DictData; use app\common\model\financial\FinancialUsingFunds; use app\common\model\financial\FinancialUsingFundsDetail; + use app\common\model\marketing\MarketingContract; use app\common\validate\BaseValidate; @@ -157,7 +157,7 @@ public function checkContract($value): bool|string { if (empty($value)) return true; - $data = CostApprovedProject::where('id', $value)->findOrEmpty(); + $data = MarketingContract::where('id', $value)->findOrEmpty(); return $data->isEmpty() ? '合同信息不存在' : true; }