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-04-16 11:11:51 +08:00
parent f9a907d6fb
commit c6d8fe189f
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/marketing/MarketingContractRefluxController.php
View File

@ -61,7 +61,7 @@
->order('id desc') ->order('id desc')
->select() ->select()
->each(function ($data) { ->each(function ($data) {
$custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty(); $dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty();
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['signed_dept_name'] = $dept['name']; $data['signed_dept_name'] = $dept['name'];

2
app/adminapi/lists/financial/FinancialBudgetDocLists.php
View File

@ -65,7 +65,7 @@
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($data) { ->select()->each(function ($data) {
$contract = MarketingContract::field('contract_name,part_a,create_time,signed_amount,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(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['part_a'] = $custom['name']; $data['part_a'] = $custom['name'];
$data['create_date'] = $contract['create_time']; $data['create_date'] = $contract['create_time'];

2
app/adminapi/lists/financial/FinancialInvoiceLists.php
View File

@ -65,7 +65,7 @@
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($data) { ->select()->each(function ($data) {
$contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,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(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a'] = $custom['name']; $data['part_a'] = $custom['name'];

2
app/adminapi/lists/financial/FinancialRefundLists.php
View File

@ -65,7 +65,7 @@
->select()->each(function ($data) { ->select()->each(function ($data) {
$contract = MarketingContract::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(); $invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a'] = $custom['name']; $data['part_a'] = $custom['name'];

2
app/adminapi/logic/financial/FinancialBudgetDocLogic.php
View File

@ -156,7 +156,7 @@
{ {
$data = FinancialBudgetDoc::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $data = FinancialBudgetDoc::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$contract = MarketingContract::field('contract_name,part_a,create_time,signed_amount,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(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['part_a'] = $custom['name']; $data['part_a'] = $custom['name'];
$data['create_date'] = $contract['create_time']; $data['create_date'] = $contract['create_time'];

2
app/adminapi/logic/financial/FinancialDepartmentIncomeSettlementLogic.php
View File

@ -157,7 +157,7 @@
$data = FinancialDepartmentIncomeSettlement::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $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(); $budget_doc = FinancialBudgetDoc::field('contract_id,code,name,issue_date')->where('id', $data['budget_doc_id'])->findOrEmpty();
$contract = MarketingContract::field('contract_name,part_a,create_time,signed_amount,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(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$data['code'] = $budget_doc['code']; $data['code'] = $budget_doc['code'];
$data['name'] = $budget_doc['name']; $data['name'] = $budget_doc['name'];
$data['issue_date'] = $budget_doc['issue_date']; $data['issue_date'] = $budget_doc['issue_date'];

2
app/adminapi/logic/financial/FinancialInvoiceLogic.php
View File

@ -136,7 +136,7 @@
{ {
$data = FinancialInvoice::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $data = FinancialInvoice::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,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(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$data['invoice_type_text'] = $data->invoice_type_text; $data['invoice_type_text'] = $data->invoice_type_text;
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';

2
app/adminapi/logic/financial/FinancialRefundLogic.php
View File

@ -120,7 +120,7 @@
$data = FinancialRefund::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $data = FinancialRefund::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,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(); $invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a'] = $custom['name']; $data['part_a'] = $custom['name'];

2
app/adminapi/logic/financial/FinancialSettlementLogic.php
View File

@ -115,7 +115,7 @@
{ {
$data = FinancialSettlement::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); $data = FinancialSettlement::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,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(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$data['invoice_type_text'] = $data->invoice_type_text; $data['invoice_type_text'] = $data->invoice_type_text;
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';

2
app/adminapi/logic/marketing/MarketingHandoverContractLogic.php
View File

@ -212,7 +212,7 @@
{ {
$data = MarketingContract::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $data = MarketingContract::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', 'part_a')->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
$dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id'); $dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id');
$admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id'); $admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id');
$data['framework_agreement_name'] = $contract['contract_name']; $data['framework_agreement_name'] = $contract['contract_name'];