diff --git a/module/task/test/model/gettaskefforts.php b/module/task/test/model/gettaskefforts.php index 04ae5608d1..8948c58496 100755 --- a/module/task/test/model/gettaskefforts.php +++ b/module/task/test/model/gettaskefforts.php @@ -3,6 +3,7 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/task.class.php'; su('admin'); +zdTable('effort')->config('effort')->gen(5); /** @@ -10,13 +11,21 @@ title=taskModel->getTaskEfforts(); cid=1 pid=1 -查看任务预计 >> 55 - */ -$taskID = '55'; -$waitstart = array('assignedTo' => 'user92','consumed' => '10'); +$userList = array('', 'admin', 'guest'); +$taskIdList = array(0, 1, 10); +$effortIdList = array(0, 1, 10); $task = new taskTest(); -$task->startTest($taskID,$waitstart); -r($task->getTaskEffortsTest($taskID)) && p('0:task') && e('55'); // 查看任务预计 +r($task->getTaskEffortsTest($taskIdList[0])) && p() && e('0'); // 任务ID为空的情况 +r($task->getTaskEffortsTest($taskIdList[1])) && p('0:id,objectType') && e('1,task'); // 任务ID正确的情况 +r($task->getTaskEffortsTest($taskIdList[2])) && p() && e('0'); // 任务ID错误的情况 + +r($task->getTaskEffortsTest($taskIdList[1], $userList[0])) && p('0:account') && e('admin'); // 任务ID正确,用户账号为空的情况 +r($task->getTaskEffortsTest($taskIdList[1], $userList[1])) && p('0:objectType') && e('task'); // 任务ID正确,用户账号正确的情况 +r($task->getTaskEffortsTest($taskIdList[1], $userList[2])) && p() && e('0'); // 任务ID正确,用户账号错误的情况 + +r($task->getTaskEffortsTest($taskIdList[1], $userList[1], $effortIdList[0])) && p('0:account') && e('admin'); // 任务ID正确,用户账号正确的情况,日志ID为空的情况 +r($task->getTaskEffortsTest($taskIdList[1], $userList[1], $effortIdList[1])) && p('0:objectType') && e('task'); // 任务ID正确,用户账号正确的情况,日志ID正确的情况 +r($task->getTaskEffortsTest($taskIdList[1], $userList[1], $effortIdList[2])) && p('0:work') && e('这是工作内容1'); // 任务ID正确,用户账号正确的情况,日志ID错误的情况 diff --git a/module/task/test/model/yaml/gettaskefforts/effort.yaml b/module/task/test/model/yaml/gettaskefforts/effort.yaml new file mode 100755 index 0000000000..00f18cc4ba --- /dev/null +++ b/module/task/test/model/yaml/gettaskefforts/effort.yaml @@ -0,0 +1,20 @@ +title: table zt_effort +desc: "任务工时记录" +author: caoyanyi +version: "1.0" +fields: + - field: id + range: 1-5 + - field: objectType + note: "对象类型" + range: task + - field: objectID + range: 1-5 + - field: consumed + range: 1-5 + - field: account + range: admin + - field: date + range: "(-1M)-(w):1D" + type: timestamp + format: "YYYY-MM-DD" diff --git a/module/task/test/task.class.php b/module/task/test/task.class.php index 395388c856..2338532a8c 100755 --- a/module/task/test/task.class.php +++ b/module/task/test/task.class.php @@ -632,22 +632,16 @@ class taskTest * * @param int $taskID * @param string $account - * @param string $append + * @param int $effortID * @access public - * @return object + * @return array */ - public function getTaskEffortsTest($taskID, $account = '', $append = '') + public function getTaskEffortsTest(int $taskID, string $account = '', int $effortID = 0): array { - $object = $this->objectModel->getTaskEfforts($taskID, $account, $append); - if(dao::isError()) - { - $error = dao::getError(); - return $error; - } - else - { - return $object; - } + $object = $this->objectModel->getTaskEfforts($taskID, $account, $effortID); + if(dao::isError()) return dao::getError(); + + return $object; } /**