重构代码并优化营销合约逻辑中的新增字段功能

This commit is contained in:
mkm 2024-07-24 14:42:10 +08:00
parent 1b7628e1cb
commit 84e53c8fd9

View File

@ -242,11 +242,11 @@
public static function detail($params): array public static function detail($params): array
{ {
$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', $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('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'] = $data['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']] ?? '';
$data['signed_dept_name'] = $dept[$data['signed_dept']] ?? ''; $data['signed_dept_name'] = $dept[$data['signed_dept']] ?? '';