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-09 11:36:40 +08:00
parent e79af98d1d
commit 7706cb2b19
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/lists/cost_project/CostApprovedProjectLists.php
View File

@ -67,7 +67,7 @@
->select()->each(function ($data) { ->select()->each(function ($data) {
$custom = MarketingCustom::field('name')->where('id', $data['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('in', '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['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['signed_dept_name'] = $dept[$data['signed_dept']]; $data['signed_dept_name'] = $dept[$data['signed_dept']];
$data['supervise_dept_name'] = $dept[$data['supervise_dept']]; $data['supervise_dept_name'] = $dept[$data['supervise_dept']];

2
app/adminapi/lists/marketing/MarketingHandoverContractLists.php
View File

@ -65,7 +65,7 @@
$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', '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('in', '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'];
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];

2
app/adminapi/logic/cost_project/CostApprovedProjectLogic.php
View File

@ -29,7 +29,7 @@
$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', '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('in', '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'];
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];

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

@ -214,7 +214,7 @@
$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', '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('in', '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'];
$data['part_a_name'] = $custom['name']; $data['part_a_name'] = $custom['name'];
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']]; $data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];