|
|
@@ -237,7 +237,7 @@ class OrderService extends Service
|
|
|
public function fillData($data, $user, $search){
|
|
|
if(empty($data['data'])) return $data;
|
|
|
|
|
|
- $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'id')));
|
|
|
+ $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));
|
|
|
$emp_2 = (new CustomerSupplyService())->getEmployeeMap(array_unique(array_merge_recursive(array_column($data['data'],'customer_id'), array_column($data['data'],'supply_id'))));
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
$data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
@@ -547,7 +547,7 @@ class OrderService extends Service
|
|
|
public function fillReminderData($data, $user, $search){
|
|
|
if(empty($data['data'])) return $data;
|
|
|
|
|
|
- $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'id')));
|
|
|
+ $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
$data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
$data['data'][$key]['order_time'] = $value['order_time'] ? date('Y-m-d',$value['order_time']) : '';
|
|
|
@@ -873,7 +873,7 @@ class OrderService extends Service
|
|
|
public function fillToDoData($data, $user, $search){
|
|
|
if(empty($data['data'])) return $data;
|
|
|
|
|
|
- $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'id')));
|
|
|
+ $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'crt_id')));
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
$data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
$data['data'][$key]['remind_start'] = $value['remind_start'] ? date('Y-m-d H:i',$value['remind_start']) : '';
|