|
|
@@ -396,10 +396,14 @@ class ConstructionService extends Service
|
|
|
$construction = $construction->toArray();
|
|
|
$construction['state_title'] = Construction::$name[$construction['state']] ?? '';
|
|
|
$construction['pq_state_title'] = Construction::$pq_name[$construction['pq_state']] ?? '';
|
|
|
+
|
|
|
+ $address_map = config('address');
|
|
|
+ $address_str = [];
|
|
|
if(! empty($construction['address1'])) {
|
|
|
$tmp = json_decode($construction['address1'],true);
|
|
|
$construction['address1'] = $tmp;
|
|
|
- $tmp = implode(' ',$tmp);
|
|
|
+ $this->findLabelsByValue($address_map,$tmp,$address_str);
|
|
|
+ $tmp = implode(' ',$address_str);
|
|
|
$tmp .= ' ' . $construction['address2'];
|
|
|
$address = $tmp;
|
|
|
}else{
|
|
|
@@ -718,12 +722,15 @@ class ConstructionService extends Service
|
|
|
//施工产品
|
|
|
$product_map = $this->getProduct($data['data']);
|
|
|
|
|
|
+ $address_map = config('address');
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
+ $address_str = [];
|
|
|
$product_tmp = $product_map[$value['id']] ?? [];
|
|
|
$data['data'][$key]['product_detail'] = implode(',',$product_tmp);
|
|
|
if(! empty($value['address1'])) {
|
|
|
$tmp = json_decode($value['address1'],true);
|
|
|
- $tmp = implode(' ',$tmp);
|
|
|
+ $this->findLabelsByValue($address_map,$tmp,$address_str);
|
|
|
+ $tmp = implode(' ',$address_str);
|
|
|
$tmp .= ' ' . $value['address2'];
|
|
|
$address = $tmp;
|
|
|
}else{
|
cqpCow