|
@@ -28,13 +28,20 @@ class ProjectGanttService
|
|
|
}
|
|
|
$group_label = $groupKey == "" ? ['id' => "", "name" => ""] : $groupNamesKeyBy[$groupKey];
|
|
|
foreach ($groupTasks[$groupKey] as $tasks){
|
|
|
- $tasks->group_label_id=$group_label['id'];
|
|
|
- $tasks->group_label_name=$group_label['name'];
|
|
|
- $tasks->group=$group;
|
|
|
+ if ($tasks->parent_id===0){ //若该任务为顶层任务,则取其任务名以及id,否则找该任务的父级id和父级name
|
|
|
+ $tasks->group_label_id=$group_label['id'];
|
|
|
+ $tasks->group_label_name=$group_label['name'];
|
|
|
+ }else{
|
|
|
+ $tasks->group_label_id=$tasks->parent_id;
|
|
|
+ $tasks->group_label_name=$tasks->parent->name;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
$items[] = [
|
|
|
// 'group' => $group,
|
|
|
// 'group_label' => $groupKey == "" ? ['id' => "", "name" => ""] : $groupNamesKeyBy[$groupKey],
|
|
|
+
|
|
|
ProjectGanttResource::collection($groupTasks[$groupKey]),
|
|
|
];
|
|
|
};
|