update
This commit is contained in:
parent
09df24504f
commit
8b044cce46
@ -68,13 +68,13 @@
|
||||
->order(['id' => 'desc'])
|
||||
->select()->each(function ($data) {
|
||||
$contract = MarketingContract::field('contract_name,contract_type,business_nature,part_a,signed_amount,create_time')->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['signed_date'] = $contract?->create_time;
|
||||
$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'] : '';
|
||||
$data['signed_date'] = !$contract->isEmpty() ? $contract['signed_date'] : '';
|
||||
$admin = Admin::field('name')->where('id', $data['collection_user'])->findOrEmpty();
|
||||
$data['collection_user_name'] = $admin?->name;
|
||||
$data['collection_user_name'] = !$admin->isEmpty() ? $admin['name'] : '';
|
||||
})
|
||||
->toArray();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user