Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Modify todo-module getTodoProjects test case.

Browse Source
This commit is contained in:
liuchenglong
2023-05-08 11:59:30 +00:00
parent f4a4d74118
commit 5799fb1bd7
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/model.php
+3 -3
View File
@@ -476,8 +476,8 @@ class todoModel extends model
*/
public function getTodoProjects(array $todoList): array
{
$projectIDList = array();
$projects = $this->config->todo->project;
$projectIDList = array();
$projectModules = $this->config->todo->project;
foreach($todoList as $type => $todos)
{
$todoIdList = array_keys($todos);
@@ -489,7 +489,7 @@ class todoModel extends model
$todoIdList = array_unique($todoIdList);
if(isset($projects[$type])) $projectIDList[$type] = $this->todoTao->getProjectList($projects[$type], $todoIdList);
if(isset($projectModules[$type])) $projectIDList[$type] = $this->todoTao->getProjectList($projectModules[$type], $todoIdList);
if(dao::isError()) return array();
}
module/todo/tao.php
+1 -1
View File
@@ -57,7 +57,7 @@ class todoTao extends todoModel
}
/**
* 获取各模块列表。
* 获取各模块project列表。
* Get project list.
*
* @param string $table
module/todo/test/model/gettodoprojects.php
+9 -9
View File
@@ -6,7 +6,7 @@ su('admin');
function initData()
{
zdTable('todo')->config('getprojectlist')->gen(10);
zdTable('todo')->config('gettodoprojects')->gen(10);
}
/**
@@ -24,16 +24,16 @@ initData();
global $tester;
$tester->loadModel('todo');
$taskData1 = array('id' => 10, 'name' => '开发任务一', 'type' => 'devel');
$taskData2 = array('id' => 11, 'name' => '开发任务二', 'type' => 'devel');
$taskData3 = array('id' => 12, 'name' => '开发任务三', 'type' => 'devel');
$taskData4 = array('id' => 13, 'name' => '开发任务四', 'type' => 'devel');
$taskData1 = array('id' => 10, 'name' => '开发任务一', 'type' => 'devel', 'execution' => 101);
$taskData2 = array('id' => 11, 'name' => '开发任务二', 'type' => 'devel', 'execution' => 102);
$taskData3 = array('id' => 12, 'name' => '开发任务三', 'type' => 'devel', 'execution' => 103);
$taskData4 = array('id' => 13, 'name' => '开发任务四', 'type' => 'devel', 'execution' => 104);
$task = new taskTest();
$task->createObject($taskData1,101);
$task->createObject($taskData2,102);
$task->createObject($taskData3,103);
$task->createObject($taskData4,104);
$task->doCreateObject($taskData1);
$task->doCreateObject($taskData2);
$task->doCreateObject($taskData3);
$task->doCreateObject($taskData4);
$ids = range(1,10);
$list = $tester->todo->getByList($ids);
module/todo/test/tao/getprojectlist.php
+8 -8
View File
@@ -24,16 +24,16 @@ initData();
global $tester;
$tester->loadModel('todo');
$taskData1 = array('id' => 10, 'name' => '开发任务一', 'type' => 'devel');
$taskData2 = array('id' => 11, 'name' => '开发任务二', 'type' => 'devel');
$taskData3 = array('id' => 12, 'name' => '开发任务三', 'type' => 'devel');
$taskData4 = array('id' => 13, 'name' => '开发任务四', 'type' => 'devel');
$taskData1 = array('id' => 10, 'name' => '开发任务一', 'type' => 'devel', 'execution' => 101);
$taskData2 = array('id' => 11, 'name' => '开发任务二', 'type' => 'devel', 'execution' => 102);
$taskData3 = array('id' => 12, 'name' => '开发任务三', 'type' => 'devel', 'execution' => 103);
$taskData4 = array('id' => 13, 'name' => '开发任务四', 'type' => 'devel', 'execution' => 104);
$task = new taskTest();
$task->createObject($taskData1,101);
$task->createObject($taskData2,102);
$task->createObject($taskData3,103);
$task->createObject($taskData4,104);
$task->doCreateObject($taskData1);
$task->doCreateObject($taskData2);
$task->doCreateObject($taskData3);
$task->doCreateObject($taskData4);
$ids = range(1,10);
$list = $tester->todo->getByList($ids);