From 3e310bd2385a0a7f5b980518d3bcf9fbea77a8da Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Tue, 22 Aug 2023 14:44:07 +0800
Subject: [PATCH] * Optimize the comments.

---
 module/task/model.php | 10 ++++++----
 module/task/tao.php   |  6 +++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 1aaddb155d..0f40fe816a 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1553,7 +1553,8 @@ class taskModel extends model
     }
 
     /**
-     * Get task list of a story.
+     * 通过需求获取对应的任务列表，任务只取部分属性。
+     * Get the task list by a story.
      *
      * @param  int   $storyID
      * @param  int   $executionID
@@ -1566,7 +1567,7 @@ class taskModel extends model
         $tasks = $this->dao->select('id, parent, name, assignedTo, pri, status, estimate, consumed, closedReason, `left`')
             ->from(TABLE_TASK)
             ->where('story')->eq($storyID)
-            ->andWhere('deleted')->eq(0)
+            ->andWhere('deleted')->eq('0')
             ->beginIF($executionID)->andWhere('execution')->eq($executionID)->fi()
             ->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
             ->fetchAll('id');
@@ -1574,13 +1575,14 @@ class taskModel extends model
         $parentIdList = array();
         foreach($tasks as $task)
         {
+            /* 如果任务不是父任务，或者父任务已经在任务列表中，或者父任务已经在当前列表中，则跳过处理。*/
             if($task->parent <= 0 or isset($tasks[$task->parent]) or isset($parentIdList[$task->parent])) continue;
             $parentIdList[$task->parent] = $task->parent;
         }
 
         $parentTasks = $this->getByIdList($parentIdList);
-        $tasks       = $this->taskTao->buildTaskTree($tasks, $parentTasks);
-        return $this->taskTao->batchComputeProgress($tasks);
+        $tasks       = $this->taskTao->buildTaskTree($tasks, $parentTasks); /* 将子任务放到父任务里，或者将父任务的名字放到子任务里。*/
+        return $this->taskTao->batchComputeProgress($tasks); /* 通过任务的消耗和剩余工时计算任务及其子任务的进度，结果以百分比的数字部分显示。*/
     }
 
     /**
diff --git a/module/task/tao.php b/module/task/tao.php
index 8a663da845..a84be40262 100644
--- a/module/task/tao.php
+++ b/module/task/tao.php
@@ -46,15 +46,19 @@ class taskTao extends taskModel
     {
         foreach($tasks as $task)
         {
+            /* 如果不是父任务则跳过。*/
             if($task->parent <= 0) continue;
+
             if(isset($tasks[$task->parent]))
             {
+                /* 如果任务列表里有这个任务的父任务，则将子任务放到父任务里，并删除子任务。*/
                 if(!isset($tasks[$task->parent]->children)) $tasks[$task->parent]->children = array();
                 $tasks[$task->parent]->children[$task->id] = $task;
                 unset($tasks[$task->id]);
             }
             else
             {
+                /* 如果任务列表里没有这个任务的父任务，则从父任务列表获取到父任务名称并附加到子任务上。*/
                 $parent = $parentTasks[$task->parent];
                 $task->parentName = $parent->name;
             }
@@ -391,7 +395,7 @@ class taskTao extends taskModel
     }
 
     /**
-     * 获取任务的进度。
+     * 获取任务的进度，通过任务的消耗和剩余工时计算，结果以百分比的数字部分显示。
      * Compute progress of a task.
      *
      * @param  object    $task