|
|
@@ -39,9 +39,9 @@ class ItemService extends Service
|
|
|
'item_node_mission' => ItemNodeMission::class,
|
|
|
];
|
|
|
$field = [
|
|
|
- 'item' => ['id','code', 'title', 'start_time', 'end_time', 'charge_id', 'state', 'crt_id','progress'],
|
|
|
- 'item_node' => ['id','code', 'title', 'start_time', 'end_time', 'charge_id', 'state', 'crt_id','progress'],
|
|
|
- 'item_node_mission' => ['id','code', 'title', 'start_time', 'end_time', 'charge_id', 'state', 'progress', 'crt_id'],
|
|
|
+ 'item' => ['id','code', 'title', 'start_time', 'end_time', 'charge_id', 'state', 'crt_id','progress', 'priority_id'],
|
|
|
+ 'item_node' => ['id','code', 'title', 'start_time', 'end_time', 'charge_id', 'state', 'crt_id','progress', 'priority_id'],
|
|
|
+ 'item_node_mission' => ['id','code', 'title', 'start_time', 'end_time', 'charge_id', 'state', 'progress', 'crt_id', 'priority_id'],
|
|
|
];
|
|
|
if (empty($data['type']) && ! isset($type[$data['type']])) return [false , '类型错误'];
|
|
|
$class = $type[$data['type']];
|
|
|
@@ -74,6 +74,7 @@ class ItemService extends Service
|
|
|
if(empty($data)) return $data;
|
|
|
|
|
|
$emp = (new EmployeeService())->getEmployeeMap(array_unique(array_merge_recursive(array_column($data,'charge_id'), array_column($data,'crt_id'))));
|
|
|
+ $tag = (new TagService())->getTagMap(array_unique(array_column($data,'priority_id')));
|
|
|
foreach ($data as $key => $value){
|
|
|
$data[$key]['start_time'] = $value['start_time'] ? date('Y-m-d',$value['start_time']) : '';
|
|
|
$data[$key]['end_time'] = $value['end_time'] ? date('Y-m-d',$value['end_time']) : '';
|
|
|
@@ -81,6 +82,8 @@ class ItemService extends Service
|
|
|
$data[$key]['charge_name'] = $emp[$value['charge_id']] ?? '';
|
|
|
$data[$key]['state_title'] = ItemNodeMission::State_Type[$value['state']] ?? "";
|
|
|
$data[$key]['type'] = $erg['type'];
|
|
|
+ $priority_tmp = $tag[$value['priority_id']] ?? [];
|
|
|
+ $data[$key]['priority_title'] = $priority_tmp['title'] ?? '';
|
|
|
}
|
|
|
|
|
|
return $data;
|
