|
|
@@ -3055,7 +3055,9 @@ class ItemService extends Service
|
|
|
|
|
|
$item = $this->getItemMap(array_unique(array_column($list['data'],'item_id')));
|
|
|
$itemNode = $this->getItemNodeMap2(array_unique(array_column($list['data'],'item_node_id')));
|
|
|
- $itemNodeMission = $this->getItemNodeMissionMap(array_unique(array_column($list['data'],'item_node_mission_id')));
|
|
|
+ $mission_id = array_unique(array_column($list['data'],'item_node_mission_id'));
|
|
|
+ $itemNodeMission = $this->getItemNodeMissionMap($mission_id);
|
|
|
+ $mission_man = $this->getMissionMembersMap($mission_id, $user['id']);
|
|
|
foreach ($list['data'] as $key => $value){
|
|
|
$list['data'][$key]['order_time'] = $value['order_time'] ? date('Y-m-d',$value['order_time']) : '';
|
|
|
$list['data'][$key]['start_time'] = $value['start_time_hour'] . ':' . $value['start_time_min'];
|
|
|
@@ -3069,6 +3071,7 @@ class ItemService extends Service
|
|
|
$list['data'][$key]['item_node_title'] = $item_node_tmp['title'] ?? '';
|
|
|
$item_node_mission_tmp = $itemNodeMission[$value['item_node_mission_id']] ?? [];
|
|
|
$list['data'][$key]['item_node_mission_title'] = $item_node_mission_tmp['title'] ?? '';
|
|
|
+ $list['data'][$key]['mission_man'] = $mission_man[$value['item_node_mission_id']] ?? [];
|
|
|
}
|
|
|
|
|
|
return $list;
|
