浏览代码

小高薪

cqp 3 月之前
父节点
当前提交
662f3782fd
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      app/Service/DeviceService.php
  2. 1 1
      app/Service/EmployeeService.php
  3. 3 3
      app/Service/ItemService.php

+ 1 - 1
app/Service/DeviceService.php

@@ -95,7 +95,7 @@ class DeviceService extends Service
             ->first();
         if(empty($customer)) return [false,'设备不存在或已被删除'];
         $customer = $customer->toArray();
-        $customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('emp_name');
+        $customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('title');
         $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
         $customer['in_time'] = $customer['in_time'] ? date("Y-m-d",$customer['in_time']): '';
 

+ 1 - 1
app/Service/EmployeeService.php

@@ -674,7 +674,7 @@ class EmployeeService extends Service
         if(! is_array($employee_ids)) $employee_ids = [$employee_ids];
 
         return Employee::whereIn('id', $employee_ids)
-            ->pluck('emp_name', 'id')
+            ->pluck('title', 'id')
             ->toArray();
     }
 }

+ 3 - 3
app/Service/ItemService.php

@@ -111,7 +111,7 @@ class ItemService extends Service
                 $id2[] = $value['data_id'];
             }
         }
-        $map = Employee::whereIn('id', $id)->select('emp_name','id','number')->get()->toArray();
+        $map = Employee::whereIn('id', $id)->select('title','id','number')->get()->toArray();
         $map = array_column($map,null,'id');
         $map2 = Device::whereIn('id', $id2)->select('code','id','title')->get()->toArray();
         $map2 = array_column($map2,null,'id');
@@ -123,7 +123,7 @@ class ItemService extends Service
                 $unit[] = [
                     'type' => $value['type'],
                     'data_id' => $value['data_id'],
-                    'data_title' => $tmp['emp_name'],
+                    'data_title' => $tmp['title'],
                     'data_code' => $tmp['number'],
                 ];
             }else{
@@ -193,7 +193,7 @@ class ItemService extends Service
         $customer = $customer->toArray();
         $customer['start_time']  = ! empty($customer['start_time']) ? date("Y-m-d", $customer['start_time']) : "";
         $customer['end_time']  = ! empty($customer['end_time']) ? date("Y-m-d", $customer['end_time']) : "";
-        $customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('emp_name');
+        $customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('title');
         $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
         $customer['state_title'] = Employee::State_Type[$customer['state']] ?? '';