diff --git a/module/task/model.php b/module/task/model.php index 93ad6eb383..6d510d95dc 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2174,19 +2174,20 @@ class taskModel extends model } /** - * Get report data of tasks per priority + * 获取按照优先级统计的报表数据。 + * Get report data of tasks per priority. * * @access public - * @return array + * @return object[] */ - public function getDataOfTasksPerPri() + public function getDataOfTasksPerPri(): array { $tasks = $this->dao->select('id,pri')->from(TABLE_TASK)->alias('t1') ->where($this->reportCondition()) ->fetchAll('id'); if(!$tasks) return array(); - $datas = $this->processData4Report($tasks, array(), 'pri'); + $datas = $this->processData4Report($tasks, array(), 'pri'); foreach($datas as $pri) $pri->name = $this->lang->task->priList[$pri->name]; return $datas; diff --git a/module/task/test/model/getdataoftasksperpri.php b/module/task/test/model/getdataoftasksperpri.php index 6e8d27b187..ca52360a42 100755 --- a/module/task/test/model/getdataoftasksperpri.php +++ b/module/task/test/model/getdataoftasksperpri.php @@ -4,21 +4,20 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/task.class.php'; su('admin'); +zdTable('task')->config('task')->gen(30); + /** title=taskModel->getDataOfTasksPerPri(); +timeout=0 cid=1 -pid=1 - -统计优先级为1的任务数量 >> 1,228 -统计优先级为2的任务数量 >> 2,228 -统计优先级为3的任务数量 >> 3,227 -统计优先级为4的任务数量 >> 4,227 */ -$task = new taskTest(); -r($task->getDataOfTasksPerPriTest()) && p('1:name,value') && e('1,228'); //统计优先级为1的任务数量 -r($task->getDataOfTasksPerPriTest()) && p('2:name,value') && e('2,228'); //统计优先级为2的任务数量 -r($task->getDataOfTasksPerPriTest()) && p('3:name,value') && e('3,227'); //统计优先级为3的任务数量 -r($task->getDataOfTasksPerPriTest()) && p('4:name,value') && e('4,227'); //统计优先级为4的任务数量 +global $tester; +$taskModule = $tester->loadModel('task'); + +r($taskModule->getDataOfTasksPerPri()) && p('1:name,value') && e('1,8'); //统计优先级为1的任务数量 +r($taskModule->getDataOfTasksPerPri()) && p('2:name,value') && e('2,8'); //统计优先级为2的任务数量 +r($taskModule->getDataOfTasksPerPri()) && p('3:name,value') && e('3,7'); //统计优先级为3的任务数量 +r($taskModule->getDataOfTasksPerPri()) && p('4:name,value') && e('4,7'); //统计优先级为4的任务数量 diff --git a/module/task/test/task.class.php b/module/task/test/task.class.php index a9a84a3724..e5c19728d0 100755 --- a/module/task/test/task.class.php +++ b/module/task/test/task.class.php @@ -923,26 +923,6 @@ class taskTest } } - /** - * Test get report data of tasks per priority. - * - * @access public - * @return array - */ - public function getDataOfTasksPerPriTest() - { - $object = $this->objectModel->getDataOfTasksPerPri(); - - if(dao::isError()) - { - return dao::getError(); - } - else - { - return $object; - } - } - /** * Test get report data of tasks per deadline. *