Merge branch 'sprint/hufangzhou_bug_30770' into 'master'

* Fix bug #30770. See merge request easycorp/zentaopms!6830
2023-02-01 09:12:24 +00:00
parent 33c29fb324 0e00ce3a8f
commit 5340535915
1 changed files with 1 additions and 1 deletions
@@ -324,7 +324,7 @@ class programplanModel extends model
                if($stage['planID'] == $task->execution)
                {
                    $stageIndex[$index]['progress']['totalEstimate'] += $task->estimate;
-                    $stageIndex[$index]['progress']['totalConsumed'] += $task->consumed;
+                    $stageIndex[$index]['progress']['totalConsumed'] += $task->parent == '-1' ? 0 : $task->consumed;
                    $stageIndex[$index]['progress']['totalReal']     += ($task->left + $task->consumed);

                    $parent = $stage['parent'];