From 7170af3b44bf1dccb03cfcdb4beb16e4badb648e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 00:52:32 +0000
Subject: [PATCH] * Finish task #84586.

---
 module/execution/control.php | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 0264d93147..f7421d9998 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -4071,22 +4071,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)
@@ -4097,6 +4082,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')