From 5799fb1bd730af445aaf7b2e48050c18a3531361 Mon Sep 17 00:00:00 2001
From: liuchenglong <liuchenglong@easycorp.ltd>
Date: Mon, 8 May 2023 11:59:30 +0000
Subject: [PATCH] * Modify todo-module getTodoProjects test case.

---
 module/todo/model.php                      |  6 +++---
 module/todo/tao.php                        |  2 +-
 module/todo/test/model/gettodoprojects.php | 18 +++++++++---------
 module/todo/test/tao/getprojectlist.php    | 16 ++++++++--------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/module/todo/model.php b/module/todo/model.php
index 7f5d947d17..809c6a619c 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -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();
         }
 
diff --git a/module/todo/tao.php b/module/todo/tao.php
index 1189609c76..55b2d975d6 100644
--- a/module/todo/tao.php
+++ b/module/todo/tao.php
@@ -57,7 +57,7 @@ class todoTao extends todoModel
     }
 
     /**
-     * 获取各模块列表。
+     * 获取各模块project列表。
      * Get project list.
      *
      * @param  string $table
diff --git a/module/todo/test/model/gettodoprojects.php b/module/todo/test/model/gettodoprojects.php
index 7a8122b55f..c6a994177d 100755
--- a/module/todo/test/model/gettodoprojects.php
+++ b/module/todo/test/model/gettodoprojects.php
@@ -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);
diff --git a/module/todo/test/tao/getprojectlist.php b/module/todo/test/tao/getprojectlist.php
index 2b6bc16188..302f0cf5e2 100755
--- a/module/todo/test/tao/getprojectlist.php
+++ b/module/todo/test/tao/getprojectlist.php
@@ -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);