diff --git a/module/programplan/model.php b/module/programplan/model.php index 50f5161ec2..69d1589fe3 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -1171,13 +1171,15 @@ class programplanModel extends model } /** - * Get the stage set to milestone. + * + * 通过项目ID获取里程碑信息。 + * Get milestones by projetc id. * * @param int $projectID * @access public * @return array */ - public function getMilestones($projectID = 0) + public function getMilestones(int $projectID = 0): array { $milestones = $this->dao->select('id, path')->from(TABLE_PROJECT) ->where('project')->eq($projectID) @@ -1186,6 +1188,7 @@ class programplanModel extends model ->andWhere('deleted')->eq(0) ->orderBy('begin_desc,path') ->fetchPairs(); + return $this->programplanTao->formatMilestones($milestones, $projectID); } diff --git a/module/programplan/tao.php b/module/programplan/tao.php index a709418e1c..d97cce8d31 100644 --- a/module/programplan/tao.php +++ b/module/programplan/tao.php @@ -219,7 +219,7 @@ class programplanTao extends programplanModel foreach($milestones as $id => $path) { - $paths = explode(',', trim($path, ',')); + $paths = explode(',', trim($path, ',')); $stageName = ''; foreach($paths as $stage) {