* Modify getTotalPercent function and test case for programplan model.

module/programplan/test/model/gettotalpercent.php

@@ -10,22 +10,18 @@ title=测试 programplanModel->getTotalPercent();
 cid=1
 pid=1
 
-测试获取阶段131的总进度 >> 60
-测试获取阶段131是父阶段的总进度 >> 0
-测试获取阶段132的总进度 >> 60
-测试获取阶段133的总进度 >> 60
-测试获取阶段134的总进度 >> 60
-测试获取阶段135的总进度 >> 60
-
 */
 
-$stageIDList = array(131, 132, 133, 134, 135);
+
+zdTable('project')->config('project')->gen(5);
+zdTable('projectproduct')->config('projectproduct')->gen(5);
+
+$stageIDList = array(2, 1, 5, 3);
 
 $programplan = new programplanTest();
 
-r($programplan->getTotalPercentTest($stageIDList[0]))       && p() && e('60'); // 测试获取阶段131的总进度
-r($programplan->getTotalPercentTest($stageIDList[0], true)) && p() && e('0');  // 测试获取阶段131是父阶段的总进度
-r($programplan->getTotalPercentTest($stageIDList[1]))       && p() && e('60'); // 测试获取阶段132的总进度
-r($programplan->getTotalPercentTest($stageIDList[2]))       && p() && e('60'); // 测试获取阶段133的总进度
-r($programplan->getTotalPercentTest($stageIDList[3]))       && p() && e('60'); // 测试获取阶段134的总进度
-r($programplan->getTotalPercentTest($stageIDList[4]))       && p() && e('60'); // 测试获取阶段135的总进度
+r($programplan->getTotalPercentTest($stageIDList[0]))        && p() && e('23'); // 测试获取阶段2的总进度
+r($programplan->getTotalPercentTest($stageIDList[0], true))  && p() && e('23'); // 测试获取阶段2是父阶段的总进度
+r($programplan->getTotalPercentTest($stageIDList[1]))        && p() && e('47'); // 测试获取阶段1的总进度
+r($programplan->getTotalPercentTest($stageIDList[2], true))  && p() && e('0');  // 测试获取阶段5是父阶段的总进度
+r($programplan->getTotalPercentTest($stageIDList[3]))        && p() && e('24'); // 测试获取阶段3的总进度

module/programplan/test/model/yaml/gettotalpercent/project.yaml

@@ -0,0 +1,28 @@
+title: zt_project
+author: jukui
+version: '1.0'
+fields:
+    - field: id
+      range: 1-6
+    - field: project
+      range: '1,2,3,4,1,1'
+    - field: name
+      range: '瀑布项目1,阶段a,阶段a子1,阶段a子1子1,阶段b,阶段c'
+    - field: parent
+      range: '0,1,2,3,1,1'
+    - field: type
+      range: 'stage'
+    - field: percent
+      range: 1-6
+      prefix: '2'
+    - field: grade
+      range: 1
+    - field: days
+      range: 1
+    - field: status
+      range: 'doing,doing,doing,closed,suspended'
+    - field: desc
+      range: 1-6
+      prefix: '项目描述'
+    - field: path
+      range: "`,1,`,`,1,2,`,`,1,2,3,`,`,1,2,3,4,`,`,1,5,`,`,1,6,`"

module/programplan/test/model/yaml/gettotalpercent/projectproduct.yaml

@@ -0,0 +1,12 @@
+title: zt_projectproduct
+author: jukui
+version: '1.0'
+fields:
+    - field: project
+      range: '1,2,3,4,5,6'
+    - field: product
+      range: '2'
+    - field: branch
+      range: 0
+    - field: plan
+      range: 0