|
@@ -137,7 +137,7 @@ class ProjectService extends Service
|
|
|
$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']) : '';
|
|
|
$project_stage[$key]['plan_time'] = $start_time . '——' . $end_time;
|
|
|
- $project_stage[$key]['finish_time'] = $value['finish_time'] ? date("Y-m-d",$value['finish_time']): '';
|
|
|
+ $project_stage[$key]['start_time'] = $value['start_time'] ? date("Y-m-d",$value['start_time']): '';
|
|
|
$project_stage[$key]['parent_id'] = $value['project_id'];
|
|
|
}
|
|
|
|
|
@@ -149,7 +149,7 @@ class ProjectService extends Service
|
|
|
$end_time = $value['plan_end_time'] ? date("Y-m-d H:i",$value['plan_end_time']) : '';
|
|
|
$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']): '';
|
|
|
- $project_stage_node[$key]['parent_id'] = $value['project_state_id'];
|
|
|
+ $project_stage_node[$key]['parent_id'] = $value['project_stage_id'];
|
|
|
}
|
|
|
|
|
|
$project_stage_node_mission = ProjectStageNodeMission::where('del_time',0)
|
|
@@ -169,10 +169,10 @@ class ProjectService extends Service
|
|
|
$tmp = explode(',', $value['employee_id']);
|
|
|
foreach ($tmp as $val){
|
|
|
$title_tmp = $emp_map[$val] ?? "";
|
|
|
- if(! $title_tmp) $title .= $title_tmp . ",";
|
|
|
+ if($title_tmp) $title .= $title_tmp . ",";
|
|
|
}
|
|
|
- $project_stage_node_mission[$key]['employee_title'] = rtrim(',', $title);
|
|
|
- $project_stage_node_mission[$key]['parent_id'] = $value['project_state_node_id'];
|
|
|
+ $project_stage_node_mission[$key]['employee_title'] = rtrim($title,',');
|
|
|
+ $project_stage_node_mission[$key]['parent_id'] = $value['project_stage_node_id'];
|
|
|
}
|
|
|
|
|
|
$project_stage_node_mission_detail = ProjectStageNodeMissionDetail::where('del_time',0)
|
|
@@ -185,7 +185,7 @@ class ProjectService extends Service
|
|
|
$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_stage_node_mission_detail[$key]['parent_id'] = $value['project_state_node_mission_id'];
|
|
|
+ $project_stage_node_mission_detail[$key]['parent_id'] = $value['project_stage_node_mission_id'];
|
|
|
|
|
|
}
|
|
|
|