cqpCow 1 rok pred
rodič
commit
7a5e9db4b7

+ 20 - 0
app/Service/CustomerService.php

@@ -592,6 +592,25 @@ class CustomerService extends Service
                 $customer_info_map[$value['customer_id']][] = $value;
             }
         }
+
+        $customer_info = CustomerInfo::where('del_time',0)
+            ->whereIn('customer_id',array_column($data['data'],'id'))
+            ->where('type',CustomerInfo::type_two)
+            ->select('data_id','customer_id')
+            ->get()->toArray();
+        $emp_map = Employee::whereIn('id',array_column($customer_info,'data_id'))
+            ->pluck('emp_name','id')
+            ->toArray();
+        $fz = [];
+        foreach ($customer_info as $value){
+            $tmp = $emp_map[$value['data_id']] ?? "";
+
+            if(isset($fz[$value['customer_id']])){
+                $fz[$value['customer_id']] .= ',' . $tmp;
+            }else{
+                $fz[$value['customer_id']] = $tmp;
+            }
+        }
         foreach ($data['data'] as $key => $value){
             if(! empty($value['address1'])) {
                 $tmp = json_decode($value['address1'],true);
@@ -614,6 +633,7 @@ class CustomerService extends Service
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data['data'][$key]['customer_detail'] = $customer_info_map[$value['id']] ?? [];
+            $data['data'][$key]['fz'] = $fz[$value['id']] ?? [];
         }
 
         return $data;

+ 4 - 2
app/Service/PaymentReceiptService.php

@@ -342,8 +342,8 @@ class PaymentReceiptService extends Service
                 ->toArray();
             foreach ($emp_id as $value){
                 $name = $emp_map[$value['data_id']] ?? "";
-                if(! isset($info[$value['data_id']])){
-                    $info[$value['data_id']] .= $name . ',';
+                if(isset($info[$value['data_id']])){
+                    $info[$value['data_id']] .= ',' . $name;
                 }else{
                     $info[$value['data_id']] = $name;
                 }
@@ -352,6 +352,8 @@ class PaymentReceiptService extends Service
 
         $finished = $not_finished = 0;
         foreach ($order as $key => $value){
+            $tmp = $info[$value['id']] ?? '';
+            $order[$key]['belong'] = $tmp;
             $order[$key]['state_title'] = PaymentReceipt::$name[$value['state']] ?? '';
             $order[$key]['payment_receipt_date'] = $value['payment_receipt_date'] ? date('Y-m-d',$value['payment_receipt_date']) : '';
             if($value['state'] == PaymentReceipt::STATE_TWO){

+ 4 - 0
config/header/16.php

@@ -11,6 +11,10 @@ return [
         'value' => '客户名称',
     ],
     [
+        'key' => 'fz',
+        'value' => '负责人',
+    ],
+    [
         'key' => 'customer_intention_title',
         'value' => '客户意向度',
     ],