|
|
@@ -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']] ?? '';
|
|
|
|