|
@@ -487,7 +487,7 @@ class ConstructionService extends Service
|
|
|
public function fillData($data){
|
|
public function fillData($data){
|
|
|
if(empty($data['data'])) return $data;
|
|
if(empty($data['data'])) return $data;
|
|
|
|
|
|
|
|
- $array = array_unique(array_merge_recursive(array_column($data['data'],'install_method'),array_column($data['data'],'urgency')));
|
|
|
|
|
|
|
+ $array = array_unique(array_merge_recursive(array_column($data['data'],'install_method'),array_column($data['data'],'urgency'),array_column($data['data'],'install_position')));
|
|
|
$basic_map = BasicType::whereIn('id',$array)
|
|
$basic_map = BasicType::whereIn('id',$array)
|
|
|
->pluck('title','id')
|
|
->pluck('title','id')
|
|
|
->toArray();
|
|
->toArray();
|
|
@@ -510,6 +510,7 @@ class ConstructionService extends Service
|
|
|
$address = $tmp;
|
|
$address = $tmp;
|
|
|
}
|
|
}
|
|
|
$data['data'][$key]['address'] = $address;
|
|
$data['data'][$key]['address'] = $address;
|
|
|
|
|
+ $data['data'][$key]['install_position_title'] = $basic_map[$value['install_position']] ?? '';
|
|
|
$data['data'][$key]['install_method_title'] = $basic_map[$value['install_method']] ?? '';
|
|
$data['data'][$key]['install_method_title'] = $basic_map[$value['install_method']] ?? '';
|
|
|
$data['data'][$key]['urgency_title'] = $basic_map[$value['urgency']] ?? '';
|
|
$data['data'][$key]['urgency_title'] = $basic_map[$value['urgency']] ?? '';
|
|
|
$data['data'][$key]['customer_title'] = $customer[$value['customer_id']] ?? '';
|
|
$data['data'][$key]['customer_title'] = $customer[$value['customer_id']] ?? '';
|
cqpCow