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-06-01 11:57:03 +08:00
parent 8e928e986b
commit 8e188776c6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/adminapi/lists/marketing/MarketingContractChangeLists.php
View File

@ -66,10 +66,10 @@
->order(['id' => 'desc'])
->select()->each(function ($data) {
$contract = MarketingContract::field('contract_name,contract_type,business_nature,signed_amount')->where('id', $data['contract_id'])->findOrEmpty();
$data['contract_name'] = $contract?->contract_name;
$data['contract_type'] = $contract?->contract_type_text;
$data['business_nature'] = $contract?->business_nature_text;
$data['signed_amount'] = $contract?->signed_amount;
$data['contract_name'] = !$contract->isEmpty() ? $contract['contract_name'] : '';
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['business_nature'] = !$contract->isEmpty() ? $contract->business_nature_text : '';
$data['signed_amount'] = !$contract->isEmpty() ? $contract['signed_amount'] : '';
})
->toArray();
}

8
app/adminapi/logic/marketing/MarketingContractChangeLogic.php
View File

@ -112,10 +112,10 @@
{
$data = MarketingContractChange::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$contract = MarketingContract::field('contract_name,contract_type,business_nature,signed_amount')->where('id', $data['contract_id'])->findOrEmpty();
$data['contract_name'] = $contract?->contract_name;
$data['contract_type'] = $contract?->contract_type_text;
$data['business_nature'] = $contract?->business_nature_text;
$data['signed_amount'] = $contract?->signed_amount;
$data['contract_name'] = !$contract->isEmpty() ? $contract['contract_name'] : '';
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['business_nature'] = !$contract->isEmpty() ? $contract->business_nature_text : '';
$data['signed_amount'] = !$contract->isEmpty() ? $contract['signed_amount'] : '';
return $data->toArray();
}
}