项目

app/Service/ProjectService.php

@@ -116,7 +116,7 @@ class ProjectService extends Service
         $project = $project->toArray();
 
         //组织数据
-        $emp_id = [$project['business_director'], $project['technical_director'], $project['online_director'], $project['after_sale_director']];
+        $emp_id = [$project['business_director'], $project['technical_director'], $project['online_director'], $project['after_sale_director'], $project['crt_id']];
         $emp_id = array_unique($emp_id);
         $emp_map = Employee::whereIn('id',$emp_id)->pluck('emp_name','id')->toArray();
         $start_time = $project['plan_start_time'] ? date("Y-m-d H:i",$project['plan_start_time']) : '';
@@ -128,6 +128,7 @@ class ProjectService extends Service
         $project['technical_director_title'] = $emp_map[$project['technical_director']] ?? "";
         $project['online_director_title'] = $emp_map[$project['online_director']] ?? "";
         $project['after_sale_director_title'] = $emp_map[$project['after_sale_director']] ?? "";
+        $project['crt_name'] = $emp_map[$project['crt_id']] ?? "";
 
         $project_stage = ProjectStage::where('del_time',0)
             ->where('project_id',$data['id'])
@@ -174,10 +175,13 @@ class ProjectService extends Service
         $project_stage_node_mission_detail = ProjectStageNodeMissionDetail::where('del_time',0)
             ->where('project_id',$data['id'])
             ->get()->toArray();
+        $employee_id = array_unique(array_column($project_stage_node_mission_detail,'crt_id'));
+        $emp_map = Employee::whereIn('id',$employee_id)->pluck('emp_name','id')->toArray();
         foreach ($project_stage_node_mission_detail as $key => $value){
             $start_time = $value['start_time'] ? date("Y-m-d H:i",$value['start_time']) : '';
             $end_time = $value['end_time'] ? date("Y-m-d H:i",$value['end_time']) : '';
             $project_stage_node_mission_detail[$key]['time'] = $start_time . '——' . $end_time;
+            $project_stage_node_mission_detail[$key]['crt_name'] = $emp_map[$value['crt_id']] ?? "";
         }
 
         $project['project_state'] = $project_stage;
@@ -211,12 +215,13 @@ class ProjectService extends Service
     public function organizationData($data) {
         if (empty($data['data'])) return $data;
 
-        $emp_id = array_unique(array_merge_recursive(array_column($data['data'], 'business_director'), array_column($data['data'], 'technical_director'),array_column($data['data'], 'online_director'),array_column($data['data'], 'after_sale_director')));
+        $emp_id = array_unique(array_merge_recursive(array_column($data['data'], 'business_director'), array_column($data['data'], 'technical_director'),array_column($data['data'], 'online_director'),array_column($data['data'], 'after_sale_director'),array_column($data['data'],'crt_id')));
         $emp_map = Employee::whereIn('id',$emp_id)->pluck('emp_name','id')->toArray();
         foreach ($data['data'] as $key => $value){
             $start_time = $value['plan_start_time'] ? date("Y-m-d H:i",$value['plan_start_time']) : '';
             $end_time = $value['plan_end_time'] ? date("Y-m-d H:i",$value['plan_end_time']) : '';
             $data['data'][$key]['plan_time'] = $start_time . '——' . $end_time;
+            $data['data'][$key]['crt_name'] = $emp_map[$value['crt_id']] ?? "";
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']): '';
             $data['data'][$key]['finish_time'] = $value['finish_time'] ? date("Y-m-d",$value['finish_time']): '';
             $data['data'][$key]['business_director_title'] = $emp_map[$value['business_director']] ?? "";