cqp 11 сар өмнө
parent
commit
4e36be40e5

+ 31 - 2
app/Service/ProjectService.php

@@ -919,6 +919,12 @@ class ProjectService extends Service
         $type = $data['type'];
 
         if($type == 1){
+            $main = Project::where('del_time',0)
+                ->where('id',$id)
+                ->first();
+            if(empty($main)) return [false, '项目不存在或已删除'];
+            $main = $main->toArray();
+
             //阶段
             $project_stage = ProjectStage::where('del_time',0)
                 ->where('project_id',$id)
@@ -930,8 +936,16 @@ class ProjectService extends Service
                 $project_stage[$key]['start_time'] = $value['start_time'] ? date("Y-m-d",$value['start_time']): '';
             }
 
-            return [true, $project_stage];
+            $main['children'] = $project_stage;
+
+            return [true, $main];
         }elseif($type == 2){
+            $main = ProjectStage::where('del_time',0)
+                ->where('id',$id)
+                ->first();
+            if(empty($main)) return [false, '项目的阶段不存在或已删除'];
+            $main = $main->toArray();
+
             //节点
             $project_stage_node = ProjectStageNode::where('del_time',0)
                 ->where('project_stage_id',$id)
@@ -942,9 +956,16 @@ class ProjectService extends Service
                 $project_stage_node[$key]['plan_time'] = $start_time . '——' . $end_time;
                 $project_stage_node[$key]['start_time'] = $value['start_time'] ? date("Y-m-d",$value['start_time']): '';
             }
+            $main['children'] = $project_stage_node;
 
-            return [true, $project_stage_node];
+            return [true, $main];
         }elseif($type == 3){
+            $main = ProjectStageNode::where('del_time',0)
+                ->where('id',$id)
+                ->first();
+            if(empty($main)) return [false, '项目阶段节点不存在或已删除'];
+            $main = $main->toArray();
+
             //任务
             $project_stage_node_mission = ProjectStageNodeMission::where('del_time',0)
                 ->where('project_stage_node_id',$id)
@@ -961,9 +982,16 @@ class ProjectService extends Service
                 }
                 $project_stage_node_mission[$key]['employee_title'] = rtrim($title,',');
             }
+            $main['children'] = $project_stage_node_mission;
 
             return [true, $project_stage_node_mission];
         }elseif ($type == 4){
+            $main = ProjectStageNodeMission::where('del_time',0)
+                ->where('id',$id)
+                ->first();
+            if(empty($main)) return [false, '项目阶段节点下该任务不存在或已删除'];
+            $main = $main->toArray();
+
             //任务报告
             $project_stage_node_mission_detail = ProjectStageNodeMissionDetail::where('del_time',0)
                 ->where('project_stage_node_mission_id',$data['id'])
@@ -976,6 +1004,7 @@ class ProjectService extends Service
                 $project_stage_node_mission_detail[$key]['time'] = $start_time . '——' . $end_time;
                 $project_stage_node_mission_detail[$key]['crt_name'] = $emp_map[$value['crt_id']] ?? "";
             }
+            $main['children'] = $project_stage_node_mission_detail;
 
             return [false, $project_stage_node_mission_detail];
         }