From 77f7f4dcebb1726cd5d282601d2ff79b8c13f3f4 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Mon, 21 Aug 2023 10:51:17 +0800
Subject: [PATCH] * Refactor getDataOfTasksPerConsumed method.

---
 module/task/model.php                         |  7 +++---
 .../test/model/getdataoftasksperconsumed.php  | 25 ++++++-------------
 module/task/test/task.class.php               | 20 ---------------
 3 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 2ae8d409b3..b89d89145b 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2248,12 +2248,13 @@ class taskModel extends model
     }
 
     /**
-     * Get report data of tasks per consumed
+     * 获取按消耗时间统计的报表数据。
+     * Get report data of tasks per consumed.
      *
      * @access public
-     * @return array
+     * @return object[]
      */
-    public function getDataOfTasksPerConsumed()
+    public function getDataOfTasksPerConsumed(): array
     {
         $tasks = $this->dao->select('id,consumed')->from(TABLE_TASK)->alias('t1')
             ->where($this->reportCondition())
diff --git a/module/task/test/model/getdataoftasksperconsumed.php b/module/task/test/model/getdataoftasksperconsumed.php
index 171ceb6bd5..7c9e63b129 100755
--- a/module/task/test/model/getdataoftasksperconsumed.php
+++ b/module/task/test/model/getdataoftasksperconsumed.php
@@ -4,27 +4,18 @@ 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->getDataOfTasksPerConsumed();
+timeout=0
 cid=1
-pid=1
-
-统计消耗工时为3的任务数量 >> 3,90
-统计消耗工时为4的任务数量 >> 4,90
-统计消耗工时为5的任务数量 >> 5,90
-统计消耗工时为6的任务数量 >> 6,91
-统计消耗工时为7的任务数量 >> 7,91
-统计消耗工时为8的任务数量 >> 8,91
-统计消耗工时为9的任务数量 >> 9,91
 
 */
 
-$task = new taskTest();
-r($task->getDataOfTasksPerConsumedTest()) && p('3:name,value') && e('3,90'); //统计消耗工时为3的任务数量
-r($task->getDataOfTasksPerConsumedTest()) && p('4:name,value') && e('4,90'); //统计消耗工时为4的任务数量
-r($task->getDataOfTasksPerConsumedTest()) && p('5:name,value') && e('5,90'); //统计消耗工时为5的任务数量
-r($task->getDataOfTasksPerConsumedTest()) && p('6:name,value') && e('6,91'); //统计消耗工时为6的任务数量
-r($task->getDataOfTasksPerConsumedTest()) && p('7:name,value') && e('7,91'); //统计消耗工时为7的任务数量
-r($task->getDataOfTasksPerConsumedTest()) && p('8:name,value') && e('8,91'); //统计消耗工时为8的任务数量
-r($task->getDataOfTasksPerConsumedTest()) && p('9:name,value') && e('9,91'); //统计消耗工时为9的任务数量
+global $tester;
+$taskModule = $tester->loadModel('task');
+
+r(count($taskModule->getDataOfTasksPerConsumed())) && p()               && e('3');   // 按消耗时间统计的数量
+r($taskModule->getDataOfTasksPerConsumed())        && p('3:name,value') && e('3,3'); // 统计消耗工时为4的任务数量
diff --git a/module/task/test/task.class.php b/module/task/test/task.class.php
index de37367e66..a31590de95 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 consumed.
-     *
-     * @access public
-     * @return array
-     */
-    public function getDataOfTasksPerConsumedTest()
-    {
-        $object = $this->objectModel->getDataOfTasksPerConsumed();
-
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            return $object;
-        }
-    }
-
     /**
      * Test get report data of tasks per finishedBy.
      *