diff --git a/test/model/execution/getmembers2import.php b/test/model/execution/getmembers2import.php
index 279171096c..adb936d2e2 100755
--- a/test/model/execution/getmembers2import.php
+++ b/test/model/execution/getmembers2import.php
@@ -9,7 +9,7 @@ $team = zdTable('team');
 $team->root->range('1');
 $team->type->range('execution');
 $team->account->range('user1,user2');
-$team->role->range('研发', '测试');
+$team->role->range('研发,测试');
 $team->days->range('5');
 $team->hours->range('7');
 $team->gen(2);
diff --git a/test/model/execution/getmembersbyidlist.php b/test/model/execution/getmembersbyidlist.php
index 12dd2fd30e..365295f55b 100755
--- a/test/model/execution/getmembersbyidlist.php
+++ b/test/model/execution/getmembersbyidlist.php
@@ -2,26 +2,47 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+zdTable('user')->gen(5);
 su('admin');
 
+$execution = zdTable('project');
+$execution->id->range('1-5');
+$execution->name->range('项目集1,项目1,迭代1,阶段1,看板1');
+$execution->type->range('program,project,sprint,stage,kanban');
+$execution->parent->range('0,1,2{3}');
+$execution->status->range('wait{3},suspended,closed,doing');
+$execution->openedBy->range('admin,user1');
+$execution->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$execution->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$execution->gen(5);
+
+$team = zdTable('team');
+$team->root->range('3-5');
+$team->type->range('execution');
+$team->account->range('admin,user1,user2,user3,user4');
+$team->role->range('研发,测试{4}');
+$team->days->range('5');
+$team->hours->range('7');
+$team->gen(10);
+
 /**
 
 title=测试executionModel->getMembersByIdListTest();
 cid=1
 pid=1
 
-批量查询敏捷执行team >> 101,po82,研发主管82
-批量查询瀑布执行team >> 131,test22,开发22
-批量查询看板执行team >> 161,test52,开发52
+批量查询敏捷执行team >> 3,admin,admin
+批量查询瀑布执行team >> 4,user1,用户1
+批量查询看板执行team >> 5,admin,admin
 批量查询执行team统计 >> 3
 
 */
 
-$executionIDList = array('101', '131', '161');
+$executionIDList = array(3, 4, 5);
 $count           = array('0','1');
 
-$execution = new executionTest();
-r($execution->getMembersByIdListTest($executionIDList, $count[0])[$executionIDList[0]]) && p('0:root,account,realname') && e('101,po82,研发主管82');// 批量查询敏捷执行team
-r($execution->getMembersByIdListTest($executionIDList, $count[0])[$executionIDList[1]]) && p('0:root,account,realname') && e('131,test22,开发22');  // 批量查询瀑布执行team
-r($execution->getMembersByIdListTest($executionIDList, $count[0])[$executionIDList[2]]) && p('0:root,account,realname') && e('161,test52,开发52');  // 批量查询看板执行team
-r($execution->getMembersByIdListTest($executionIDList, $count[1]))                      && p()                          && e('3');                  // 批量查询执行team统计
\ No newline at end of file
+$executionTester = new executionTest();
+r($executionTester->getMembersByIdListTest($executionIDList, $count[0])[$executionIDList[0]]) && p('0:root,account,realname') && e('3,admin,admin'); // 批量查询敏捷执行team
+r($executionTester->getMembersByIdListTest($executionIDList, $count[0])[$executionIDList[1]]) && p('0:root,account,realname') && e('4,user1,用户1'); // 批量查询瀑布执行team
+r($executionTester->getMembersByIdListTest($executionIDList, $count[0])[$executionIDList[2]]) && p('0:root,account,realname') && e('5,admin,admin'); // 批量查询看板执行team
+r($executionTester->getMembersByIdListTest($executionIDList, $count[1]))                      && p()                          && e('3');             // 批量查询执行team统计
diff --git a/test/model/execution/getorderedexecutions.php b/test/model/execution/getorderedexecutions.php
index 914e817bfb..1d6d00796e 100755
--- a/test/model/execution/getorderedexecutions.php
+++ b/test/model/execution/getorderedexecutions.php
@@ -2,48 +2,64 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+zdTable('user')->gen(5);
 su('admin');
 
+zdTable('team')->gen(0);
+
+$execution = zdTable('project');
+$execution->id->range('1-10');
+$execution->name->range('项目集1,项目1,项目2,项目3,迭代1,迭代2,阶段1,阶段2,看板1,看板2');
+$execution->type->range('program,project{3},sprint{2},stage{2},kanban{2}');
+$execution->model->range('[],scrum,waterfall,kanban,[]{6}');
+$execution->parent->range('0,1{3},2{2},3{2},4{2}');
+$execution->project->range('0{4},2{2},3{2},4{2}');
+$execution->status->range('wait,doing,done,closed');
+$execution->vision->range('rnd');
+$execution->openedBy->range('admin,user1');
+$execution->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$execution->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$execution->gen(10);
+
 /**
 
 title=executionModel->getOrderedExecutions();
 cid=1
 pid=1
 
-敏捷项目wait状态执行查看 >> 11,wait,sprint
-敏捷项目doing状态执行查看 >> 12,doing,sprint
-瀑布项目wait状态执行查看 >> 41,wait,stage
-瀑布项目doing状态执行查看 >> 42,doing,stage
-看板项目wait状态执行查看 >> 71,wait,kanban
-看板项目doing状态执行查看 >> 72,doing,kanban
-敏捷项目wait状态执行统计 >> 7
-敏捷项目doing状态执行统计 >> 7
-瀑布项目wait状态执行统计 >> 8
-瀑布项目doing状态执行统计 >> 8
-看板项目wait状态执行统计 >> 6
-看板项目doing状态执行统计 >> 6
+敏捷项目wait状态执行查看 >> 2,wait,sprint
+敏捷项目doing状态执行查看 >> 2,doing,sprint
+瀑布项目wait状态执行查看 >> 0
+瀑布项目doing状态执行查看 >> 0
+看板项目wait状态执行查看 >> 4,wait,kanban
+看板项目doing状态执行查看 >> 4,doing,kanban
+敏捷项目wait状态执行统计 >> 1
+敏捷项目doing状态执行统计 >> 1
+瀑布项目wait状态执行统计 >> 0
+瀑布项目doing状态执行统计 >> 0
+看板项目wait状态执行统计 >> 1
+看板项目doing状态执行统计 >> 1
 敏捷项目done状态执行统计 >> 0
 敏捷项目closed状态执行统计 >> 0
 
 */
 
-$projectIDList = array('11', '12', '41', '42', '71', '72');
+$projectIDList = array(2, 3, 4);
 $status        = array('wait', 'doing', 'done', 'closed');
 $count         = array('0', '1');
 
-$execution = new executionTest();
-//var_dump($execution->getOrderedExecutionsTest($projectIDList[5],$status[1],$count[0]));die;
-r($execution->getOrderedExecutionsTest($projectIDList[0],$status[0],$count[0])) && p('101:project,status,type') && e('11,wait,sprint');  //敏捷项目wait状态执行查看
-r($execution->getOrderedExecutionsTest($projectIDList[1],$status[1],$count[0])) && p('102:project,status,type') && e('12,doing,sprint'); //敏捷项目doing状态执行查看
-r($execution->getOrderedExecutionsTest($projectIDList[2],$status[0],$count[0])) && p('701:project,status,type') && e('41,wait,stage');   //瀑布项目wait状态执行查看
-r($execution->getOrderedExecutionsTest($projectIDList[3],$status[1],$count[0])) && p('702:project,status,type') && e('42,doing,stage');  //瀑布项目doing状态执行查看
-r($execution->getOrderedExecutionsTest($projectIDList[4],$status[0],$count[0])) && p('161:project,status,type') && e('71,wait,kanban');  //看板项目wait状态执行查看
-r($execution->getOrderedExecutionsTest($projectIDList[5],$status[1],$count[0])) && p('162:project,status,type') && e('72,doing,kanban'); //看板项目doing状态执行查看
-r($execution->getOrderedExecutionsTest($projectIDList[0],$status[0],$count[1])) && p()                          && e('7');               //敏捷项目wait状态执行统计
-r($execution->getOrderedExecutionsTest($projectIDList[1],$status[1],$count[1])) && p()                          && e('7');               //敏捷项目doing状态执行统计
-r($execution->getOrderedExecutionsTest($projectIDList[2],$status[0],$count[1])) && p()                          && e('8');               //瀑布项目wait状态执行统计
-r($execution->getOrderedExecutionsTest($projectIDList[3],$status[1],$count[1])) && p()                          && e('8');               //瀑布项目doing状态执行统计
-r($execution->getOrderedExecutionsTest($projectIDList[4],$status[0],$count[1])) && p()                          && e('6');               //看板项目wait状态执行统计
-r($execution->getOrderedExecutionsTest($projectIDList[5],$status[1],$count[1])) && p()                          && e('6');               //看板项目doing状态执行统计
-r($execution->getOrderedExecutionsTest($projectIDList[0],$status[2],$count[1])) && p()                          && e('0');               //敏捷项目done状态执行统计
-r($execution->getOrderedExecutionsTest($projectIDList[0],$status[3],$count[1])) && p()                          && e('0');               //敏捷项目closed状态执行统计
\ No newline at end of file
+$executionTester = new executionTest();
+r($executionTester->getOrderedExecutionsTest($projectIDList[0],$status[0],$count[0])) && p('5:project,status,type')  && e('2,wait,sprint');  // 敏捷项目wait状态执行查看
+r($executionTester->getOrderedExecutionsTest($projectIDList[0],$status[1],$count[0])) && p('6:project,status,type')  && e('2,doing,sprint'); // 敏捷项目doing状态执行查看
+r($executionTester->getOrderedExecutionsTest($projectIDList[1],$status[0],$count[0])) && p()                         && e('0');              // 瀑布项目wait状态执行查看
+r($executionTester->getOrderedExecutionsTest($projectIDList[1],$status[1],$count[0])) && p()                         && e('0');              // 瀑布项目doing状态执行查看
+r($executionTester->getOrderedExecutionsTest($projectIDList[2],$status[0],$count[0])) && p('9:project,status,type')  && e('4,wait,kanban');  // 看板项目wait状态执行查看
+r($executionTester->getOrderedExecutionsTest($projectIDList[2],$status[1],$count[0])) && p('10:project,status,type') && e('4,doing,kanban'); // 看板项目doing状态执行查看
+r($executionTester->getOrderedExecutionsTest($projectIDList[0],$status[0],$count[1])) && p()                         && e('1');              // 敏捷项目wait状态执行统计
+r($executionTester->getOrderedExecutionsTest($projectIDList[0],$status[1],$count[1])) && p()                         && e('1');              // 敏捷项目doing状态执行统计
+r($executionTester->getOrderedExecutionsTest($projectIDList[1],$status[0],$count[1])) && p()                         && e('0');              // 瀑布项目wait状态执行统计
+r($executionTester->getOrderedExecutionsTest($projectIDList[1],$status[1],$count[1])) && p()                         && e('0');              // 瀑布项目doing状态执行统计
+r($executionTester->getOrderedExecutionsTest($projectIDList[2],$status[0],$count[1])) && p()                         && e('1');              // 看板项目wait状态执行统计
+r($executionTester->getOrderedExecutionsTest($projectIDList[2],$status[1],$count[1])) && p()                         && e('1');              // 看板项目doing状态执行统计
+r($executionTester->getOrderedExecutionsTest($projectIDList[0],$status[2],$count[1])) && p()                         && e('0');              // 敏捷项目done状态执行统计
+r($executionTester->getOrderedExecutionsTest($projectIDList[0],$status[3],$count[1])) && p()                         && e('0');              // 敏捷项目closed状态执行统计