|
@@ -1266,6 +1266,9 @@ class ItemService extends Service
|
|
|
|
|
|
|
|
$emp = (new EmployeeService())->getEmployeeMap(array_unique(array_merge_recursive(array_column($data['data'],'charge_id'), array_column($data['data'],'crt_id'))));
|
|
$emp = (new EmployeeService())->getEmployeeMap(array_unique(array_merge_recursive(array_column($data['data'],'charge_id'), array_column($data['data'],'crt_id'))));
|
|
|
$tag = (new TagService())->getTagMap(array_unique(array_merge_recursive(array_column($data['data'],'priority_id'),array_column($data['data'],'node_id'))));
|
|
$tag = (new TagService())->getTagMap(array_unique(array_merge_recursive(array_column($data['data'],'priority_id'),array_column($data['data'],'node_id'))));
|
|
|
|
|
+ $item = Item::whereIn('id', array_unique(array_column($data['data'],'item_id')))
|
|
|
|
|
+ ->pluck('title','id')
|
|
|
|
|
+ ->toArray();
|
|
|
foreach ($data['data'] as $key => $value){
|
|
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]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
$data['data'][$key]['start_time'] = $value['start_time'] ? date('Y-m-d',$value['start_time']) : '';
|
|
$data['data'][$key]['start_time'] = $value['start_time'] ? date('Y-m-d',$value['start_time']) : '';
|
|
@@ -1279,6 +1282,8 @@ class ItemService extends Service
|
|
|
$node_tmp = $tag[$value['node_id']] ?? [];
|
|
$node_tmp = $tag[$value['node_id']] ?? [];
|
|
|
$data['data'][$key]['node_title'] = $node_tmp['title'] ?? '';
|
|
$data['data'][$key]['node_title'] = $node_tmp['title'] ?? '';
|
|
|
$data['data'][$key]['node_code'] = $node_tmp['code'] ?? '';
|
|
$data['data'][$key]['node_code'] = $node_tmp['code'] ?? '';
|
|
|
|
|
+ $data['data'][$key]['item_title'] = $item[$value['item_id']] ?? '';
|
|
|
|
|
+ $data['data'][$key]['progress'] = rand(1,100); // todo
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return $data;
|
|
return $data;
|