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

Merge branch 'sprint/290_liumengyi_84586' into 'master'

Browse Source 
* Finish task #84586.

See merge request easycorp/zentaopms!6987
This commit is contained in:
王怡栋
2023-02-20 01:15:52 +00:00
parent 5d7f729008 2ebf416299
commit bc4efa791c
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -16
View File
@@ -4092,22 +4092,7 @@ class execution extends control
unset($fields[$key]);
}
$executionStats = $this->execution->getStatData($projectID, $status == 'byproduct' ? 'all' : $status, $productID, 0, false, '', 'id_asc');
if(isset($project->model) and $project->model == 'waterfall')
{
$stageList = array();
foreach($executionStats as $stage)
{
$stageList[] = $stage;
foreach($stage->children as $child)
{
$child->name = $stage->name . '/' . $child->name;
$stageList[] = $child;
}
}
$executionStats = $stageList;
}
$executionStats = $this->execution->getStatData($projectID, $status == 'byproduct' ? 'all' : $status, $productID, 0, false, 'hasParentName', 'order_asc');
$users = $this->loadModel('user')->getPairs('noletter');
foreach($executionStats as $i => $execution)
@@ -4118,6 +4103,7 @@ class execution extends control
$execution->totalConsumed = $execution->hours->totalConsumed;
$execution->totalLeft = $execution->hours->totalLeft;
$execution->progress = $execution->hours->progress . '%';
$execution->name = isset($execution->title) ? $execution->title : $execution->name;
if($this->app->tab == 'project' and ($project->model == 'agileplus' or $project->model == 'waterfallplus')) $execution->method = zget($executionLang->typeList, $execution->type);
if($this->post->exportType == 'selected')