update
This commit is contained in:
parent
c6d8fe189f
commit
8d508df2de
@ -65,10 +65,10 @@
|
|||||||
->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', $data['part_a'])->findOrEmpty();
|
$custom = MarketingCustom::field('name')->where('id', $contract['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_name'] = $custom['name'];
|
||||||
$data['part_b'] = $contract['part_b'];
|
$data['part_b'] = $contract['part_b'];
|
||||||
$data['sign_money'] = $contract['signed_amount'];
|
$data['sign_money'] = $contract['signed_amount'];
|
||||||
$data['sign_time'] = $contract['create_time'];
|
$data['sign_time'] = $contract['create_time'];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user