Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task#8477.

Browse Source
This commit is contained in:
hufangzhou
2020-11-27 14:55:15 +08:00
parent 1e7021328a
commit 260f181829
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+14 -1
View File
@@ -956,12 +956,25 @@ class projectModel extends model
$project = $this->loadModel('program')->getPRJByID($projectID);
if($project->model == 'waterfall')
{
$executionProducts = $this->dao->select('t1.project,t1.product')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
->where('project')->in(array_keys($executions))
->andWhere('t2.deleted')->eq(0)
->fetchPairs();
$products = $this->loadModel('product')->getProductPairsByProject($projectID);
foreach($executions as $executionID => $execution)
{
if($execution->parent and isset($executions[$execution->parent])) $executions[$execution->id]->name = $executions[$execution->parent]->name . '/' . $execution->name;
}
foreach($executions as $execution) if($execution->grade == 2) unset($executions[$execution->parent]);
foreach($executions as $executionID => $execution)
{
if($execution->grade == 2) unset($executions[$execution->parent]);
$linkProductID = $executionProducts[$executionID];
$execution->name = $products[$linkProductID] . '/' . $execution->name;
}
}
if($pairs)