施工单

app/Service/ConstructionService.php

@@ -229,16 +229,26 @@ class ConstructionService extends Service
             ->where('construction_id',$construction['id'])
             ->select('id','construction_id','employee_id','type','contact_type','contact_info')
             ->get()->toArray();
+        $emp_map = Employee::whereIn('id',array_unique(array_merge_recursive([$construction['crt_id']],array_column($construction_info,'employee_id'))))
+            ->pluck('emp_name','id')
+            ->toArray();
+        $basic_map2 = BasicType::whereIn('id',array_unique(array_column($construction_info,'contact_type')))
+            ->pluck('title','id')
+            ->toArray();
         foreach ($construction_info as $value){
             if($value['type'] == ConstructionInfo::type_one){
-                $construction['construction_contact'][] = [
+                $tmp = [
                     'id' => $value['contact_type'],
+                    'title' => $basic_map2[$value['contact_type']] ?? '',
                     'info' => $value['contact_info']
                 ];
+                $construction['customer_contact'][] = $tmp;
             }elseif ($value['type'] == ConstructionInfo::type_two){
-                $construction['employee_one'][] = [
-                    $value['employee_id']
+                $tmp = [
+                    'id' => $value['employee_id'],
+                    'name' => $emp_map[$value['employee_id']],
                 ];
+                $construction['employee_one'][] = $tmp;
             }
         }
 
@@ -254,6 +264,8 @@ class ConstructionService extends Service
                 'number' => $value['number'],
             ];
         }
+        $construction['crt_name'] = $emp_map[$construction['crt_id']] ?? '';
+        $construction['crt_time'] = $construction['crt_time'] ? date("Y-m-d H:i:s",$construction['crt_time']): '';
 
         return [true, $construction];
     }

app/Service/ContactsService.php

@@ -256,17 +256,11 @@ class ContactsService extends Service
                     'info' => $value['contact_info']
                 ];
             }elseif ($value['type'] == ContactsInfo::type_two){
-                $customer['customers'][] = [
-                    $value['employee_id']
-                ];
+                $customer['customers'][] = $value['employee_id'];
             }elseif ($value['type'] == ContactsInfo::type_three){
-                $customer['employee_one'][] = [
-                    $value['employee_id']
-                ];
+                $customer['employee_one'][] = $value['employee_id'];
             }elseif ($value['type'] == ContactsInfo::type_four){
-                $customer['employee_two'][] = [
-                    $value['employee_id']
-                ];
+                $customer['employee_two'][] = $value['employee_id'];
             }
         }
 

app/Service/CustomerService.php

@@ -282,7 +282,14 @@ class CustomerService extends Service
             ->first();
         if(empty($customer)) return [false,'客户不存在或已被删除'];
         $customer = $customer->toArray();
-        if(! empty($customer['address1'])) $customer['address1'] = json_decode($customer['address1'],true);
+        $address = '';
+        if(! empty($customer['address1'])) {
+            $tmp = json_decode($customer['address1'],true);
+            $tmp = implode(' ',$tmp);
+            $tmp .= ' ' . $customer['address2'];
+            $address = $tmp;
+        }
+        $customer['address'] = $address;
         $customer['customer_contact'] = $customer['employee_one'] = $customer['employee_two'] = $customer['employee_three'] = $customer['img'] = $customer['file'] = [];
         $array = [
             $customer['customer_intention'],
@@ -318,34 +325,46 @@ class CustomerService extends Service
             ->where('customer_id',$customer['id'])
             ->select('id','customer_id','contact_type','contact_info','employee_id','file','type')
             ->get()->toArray();
+        $emp_map = Employee::whereIn('id',array_unique(array_merge_recursive([$customer['crt_id']],array_column($customer_info,'employee_id'))))
+            ->pluck('emp_name','id')
+            ->toArray();
+        $basic_map2 = BasicType::whereIn('id',array_unique(array_column($customer_info,'contact_type')))
+            ->pluck('title','id')
+            ->toArray();
         foreach ($customer_info as $value){
             if($value['type'] == CustomerInfo::type_one){
-                $customer['customer_contact'][] = [
+                $tmp = [
                     'id' => $value['contact_type'],
+                    'title' => $basic_map2[$value['contact_type']] ?? '',
                     'info' => $value['contact_info']
                 ];
+                $customer['customer_contact'][] = $tmp;
             }elseif ($value['type'] == CustomerInfo::type_two){
-                $customer['employee_one'][] = [
-                    $value['employee_id']
+                $tmp = [
+                    'id' => $value['employee_id'],
+                    'name' => $emp_map[$value['employee_id']],
                 ];
+                $customer['employee_one'][] = $tmp;
             }elseif ($value['type'] == CustomerInfo::type_three){
-                $customer['employee_two'][] = [
-                    $value['employee_id']
+                $tmp = [
+                    'id' => $value['employee_id'],
+                    'name' => $emp_map[$value['employee_id']],
                 ];
+                $customer['employee_two'][] = $tmp;
             }elseif ($value['type'] == CustomerInfo::type_four){
-                $customer['employee_three'][] = [
-                    $value['employee_id']
+                $tmp = [
+                    'id' => $value['employee_id'],
+                    'name' => $emp_map[$value['employee_id']],
                 ];
+                $customer['employee_three'][] = $tmp;
             }elseif ($value['type'] == CustomerInfo::type_five){
-                $customer['img'][] = [
-                    $value['file']
-                ];
+                $customer['img'][] = $value['file'];
             }elseif ($value['type'] == CustomerInfo::type_six){
-                $customer['file'][] = [
-                    $value['employee_id']
-                ];
+                $customer['file'][] = $value['employee_id'];
             }
         }
+        $customer['crt_name'] = $emp_map[$customer['crt_id']] ?? '';
+        $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
 
         return [true, $customer];
     }

app/Service/SalesOrderService.php

@@ -288,19 +288,20 @@ class SalesOrderService extends Service
             ->where('sales_order_id',$sales['id'])
             ->select('id','sales_order_id','employee_id','type')
             ->get()->toArray();
+        $emp_map = Employee::whereIn('id',array_unique(array_merge_recursive([$sales['crt_id']],array_column($sales_info,'employee_id'))))
+            ->pluck('emp_name','id')
+            ->toArray();
         foreach ($sales_info as $value){
+            $tmp = [
+                'id' => $value['employee_id'],
+                'name' => $emp_map[$value['employee_id']],
+            ];
             if($value['type'] == SalesOrderInfo::type_one){
-                $sales['employee_one'][] = [
-                    $value['employee_id']
-                ];
+                $sales['employee_one'][] = $tmp;
             }elseif ($value['type'] == SalesOrderInfo::type_two){
-                $sales['employee_two'][] = [
-                    $value['employee_id']
-                ];
+                $sales['employee_two'][] = $tmp;
             }elseif ($value['type'] == SalesOrderInfo::type_three){
-                $sales['employee_three'][] = [
-                    $value['employee_id']
-                ];
+                $sales['employee_three'][] = $tmp;
             }
         }
 
@@ -316,6 +317,8 @@ class SalesOrderService extends Service
                 'number' => $value['number'],
             ];
         }
+        $sales['crt_name'] = $emp_map[$sales['crt_id']] ?? '';
+        $sales['crt_time'] = $sales['crt_time'] ? date("Y-m-d H:i:s",$sales['crt_time']): '';
 
         return [true, $sales];
     }