From 31e2c020f7870e5c176f5f3d6f1431adbe5cf29d Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 9 Feb 2022 16:09:57 +0800
Subject: [PATCH] *Finish task #48843.

---
 module/program/model.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/program/model.php b/module/program/model.php
index 70faddc9c5..fab8b4d89e 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -225,7 +225,8 @@ class programModel extends model
             ->andWhere('deleted')->eq(0)
             ->fetchGroup('execution', 'id');
 
-        $hours = $this->computeProgress($tasks);
+        $hours        = $this->computeProgress($tasks);
+        $projectHours = $this->getProgressList();
 
         /* Group data by product. */
         foreach($productGroup as $programID => $products)
@@ -249,7 +250,7 @@ class programModel extends model
                     }
 
                     $project->execution = $execution;
-                    $project->hours     = zget($hours, $project->id, array());
+                    $project->hours['progress']   = zget($projectHours, $project->id, array());
                     $product->projects[$status][] = $project;
                 }
             }