From 0d800981ef587451b69066063abb78e300e70947 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@chandao.com>
Date: Wed, 13 Aug 2025 08:53:33 +0800
Subject: [PATCH]  * [perf story #77161] Adjust projectModel getWorkHour unit
 test.

---
 module/doc/tao.php                        |  2 +-
 module/personnel/model.php                |  4 ++--
 module/project/test/model/getworkhour.php | 22 +++++++++++++++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/module/doc/tao.php b/module/doc/tao.php
index aa997f92ca..5b55ea093a 100644
--- a/module/doc/tao.php
+++ b/module/doc/tao.php
@@ -272,7 +272,7 @@ class docTao extends docModel
      * @access protected
      * @return void
      */
-    public function doUpdateDoc(int $docID, object $doc, $basicInfoChanged = false)
+    public function doUpdateDoc(int $docID, object $doc, bool $basicInfoChanged = false)
     {
         $this->dao->update(TABLE_DOC)->data($doc)->autoCheck()->where('id')->eq($docID)->exec();
 
diff --git a/module/personnel/model.php b/module/personnel/model.php
index d3057d32bb..f7ae7e95b9 100644
--- a/module/personnel/model.php
+++ b/module/personnel/model.php
@@ -684,7 +684,7 @@ class personnelModel extends model
             $this->dao->update(TABLE_PRODUCT)->set('whitelist')->eq($newWhitelist)->where('id')->eq($productID)->exec();
 
             $viewProducts    = $this->dao->select('products')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('products');
-            $newViewProducts = trim(str_replace(",{$productID},", '', ",{$viewProducts},"), ',');
+            $newViewProducts = trim(str_replace(",{$productID},", ',', ",{$viewProducts},"), ',');
             $this->dao->update(TABLE_USERVIEW)->set('products')->eq($newViewProducts)->where('account')->eq($account)->exec();
         }
 
@@ -771,7 +771,7 @@ class personnelModel extends model
                 $this->dao->update(TABLE_PROJECT)->set('whitelist')->eq($newWhitelist)->where('id')->eq($projectID)->exec();
 
                 $viewProjects    = $this->dao->select('projects')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('projects');
-                $newViewProjects = trim(str_replace(",{$projectID},", '', ",{$viewProjects},"), ',');
+                $newViewProjects = trim(str_replace(",{$projectID},", ',', ",{$viewProjects},"), ',');
                 $this->dao->update(TABLE_USERVIEW)->set('projects')->eq($newViewProjects)->where('account')->eq($account)->exec();
             }
         }
diff --git a/module/project/test/model/getworkhour.php b/module/project/test/model/getworkhour.php
index d026014ca1..e5d3d1cac4 100755
--- a/module/project/test/model/getworkhour.php
+++ b/module/project/test/model/getworkhour.php
@@ -13,6 +13,22 @@ title=测试 projectModel::getWorkhour;
 timeout=0
 cid=1
 
+- 获取不存在项目工时信息
+ - 属性totalHours @0
+ - 属性totalEstimate @0
+ - 属性totalConsumed @0
+ - 属性totalLeft @0
+- 获取项目ID为11的总预计工时
+ - 属性totalHours @112.5
+ - 属性totalEstimate @61
+ - 属性totalConsumed @18
+ - 属性totalLeft @61
+- 获取项目ID为60的总消耗工时
+ - 属性totalHours @225
+ - 属性totalEstimate @35
+ - 属性totalConsumed @11
+ - 属性totalLeft @35
+
 */
 
 $projectIdList = array(1, 11, 60);
@@ -20,6 +36,6 @@ $projectIdList = array(1, 11, 60);
 global $tester;
 $tester->loadModel('project');
 
-r($tester->project->getWorkHour($projectIdList[0])) && p('totalHours')    && e('0');  // 获取不存在项目工时信息
-r($tester->project->getWorkHour($projectIdList[1])) && p('totalEstimate') && e('61'); // 获取项目ID为11的总预计工时
-r($tester->project->getWorkHour($projectIdList[2])) && p('totalConsumed') && e('11'); // 获取项目ID为60的总消耗工时
+r($tester->project->getWorkHour($projectIdList[0])) && p('totalHours,totalEstimate,totalConsumed,totalLeft') && e('0,0,0,0');        // 获取不存在项目工时信息
+r($tester->project->getWorkHour($projectIdList[1])) && p('totalHours,totalEstimate,totalConsumed,totalLeft') && e('112.5,61,18,61'); // 获取项目ID为11的总预计工时
+r($tester->project->getWorkHour($projectIdList[2])) && p('totalHours,totalEstimate,totalConsumed,totalLeft') && e('225,35,11,35');   // 获取项目ID为60的总消耗工时