From dd27a540383bf1f9868d6535b1b4349e57b1e5f9 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Mon, 21 Aug 2023 10:55:58 +0800
Subject: [PATCH] * Refactor getDataOfTasksPerFinishedBy method.

---
 module/task/model.php                         | 10 ++++++----
 .../model/getdataoftasksperfinishedby.php     | 13 +++++++-----
 module/task/test/task.class.php               | 20 -------------------
 module/task/test/yaml/task.yaml               |  2 ++
 4 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index b89d89145b..6e95c85f45 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2266,12 +2266,13 @@ class taskModel extends model
     }
 
     /**
-     * Get report data of tasks per finishedBy
+     * 获取按由谁完成统计的报表数据。
+     * Get report data of tasks per finishedBy.
      *
      * @access public
-     * @return array
+     * @return object[]
      */
-    public function getDataOfTasksPerFinishedBy()
+    public function getDataOfTasksPerFinishedBy(): array
     {
         $tasks = $this->dao->select('id,finishedBy')->from(TABLE_TASK)->alias('t1')
             ->where($this->reportCondition())
@@ -2279,8 +2280,9 @@ class taskModel extends model
             ->fetchAll('id');
         if(!$tasks) return array();
 
-        $datas    = $this->processData4Report($tasks, array(), 'finishedBy');
+        $datas = $this->processData4Report($tasks, array(), 'finishedBy');
 
+        /* Get user's realname. */
         if(!isset($this->users)) $this->users = $this->loadModel('user')->getPairs('noletter');
         foreach($datas as $account => $data)
         {
diff --git a/module/task/test/model/getdataoftasksperfinishedby.php b/module/task/test/model/getdataoftasksperfinishedby.php
index a524e4b956..3d9e92e22b 100755
--- a/module/task/test/model/getdataoftasksperfinishedby.php
+++ b/module/task/test/model/getdataoftasksperfinishedby.php
@@ -4,15 +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->getDataOfTasksPerFinishedBy();
+timeout=0
 cid=1
-pid=1
-
-统计没有完成者的任务数量 >> 0
 
 */
 
-$task = new taskTest();
-r($task->getDataOfTasksPerFinishedByTest()) && p() && e('0'); //统计没有完成者的任务数量
+global $tester;
+$taskModule = $tester->loadModel('task');
+
+r(count($taskModule->getDataOfTasksPerFinishedBy())) && p()                   && e('1');        // 按由谁完成统计的数量
+r($taskModule->getDataOfTasksPerFinishedBy())        && p('admin:name,value') && e('admin,10'); // 完成者为admin的任务数量
diff --git a/module/task/test/task.class.php b/module/task/test/task.class.php
index a31590de95..49594bac25 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 finishedBy.
-     *
-     * @access public
-     * @return array
-     */
-    public function getDataOfTasksPerFinishedByTest()
-    {
-        $object = $this->objectModel->getDataOfTasksPerFinishedBy();
-
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            return $object;
-        }
-    }
-
     /**
      * Test get report data of tasks per closed reason.
      *
diff --git a/module/task/test/yaml/task.yaml b/module/task/test/yaml/task.yaml
index 6f197eebc6..2960d51bd9 100755
--- a/module/task/test/yaml/task.yaml
+++ b/module/task/test/yaml/task.yaml
@@ -36,6 +36,8 @@ fields:
     type: timestamp
     format: "YY/MM/DD"
     postfix: "\t"
+  - field: finishedBy
+    range: "[],admin{2},[]{3}"
   - field: finishedDate
     range: "20210101 000000:1D"
     type: timestamp