Merge branch release/21.7.5 of zentao/zentaopms (#11238)

module/project/test/lib/projectzen.unittest.class.php

@@ -111,4 +111,17 @@ class projectZenTest
 
         return callZenMethod('project', 'buildEditForm', [$projectID, $project], 'view');
     }
+
+    /**
+     * 处理项目列表展示数据。
+     * Process project list display data.
+     *
+     * @access public
+     * @return array
+     */
+    public function processProjectListDataTest(): array
+    {
+        $projectList = $this->objectModel->dao->select('*')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchAll('id');
+        return callZenMethod('project', 'processProjectListData', [$projectList]);
+    }
 }

module/project/test/zen/processprojectlistdata.php

@@ -0,0 +1,32 @@
+#!/usr/bin/env php
+<?php
+/**
+
+title=测试 projectZen::processProjectListData();
+timeout=0
+cid=1
+
+- 获取处理后的项目数据
+ - 第1条的name属性 @瀑布项目2
+ - 第1条的budget属性 @$ 79.99万
+ - 第1条的storyPoints属性 @0 h
+ - 第1条的estimate属性 @0
+ - 第1条的consume属性 @0
+ - 第1条的left属性 @0
+
+*/
+include dirname(__FILE__, 5) . '/test/lib/init.php';
+include dirname(__FILE__, 2) . '/lib/projectzen.unittest.class.php';
+zenData('project')->loadYaml('project')->gen(5);
+zenData('product')->loadYaml('product')->gen(5);
+zenData('projectproduct')->loadYaml('projectproduct')->gen(10);
+zenData('task')->loadYaml('task')->gen(10);
+zenData('effort')->loadYaml('effort')->gen(10);
+zenData('branch')->gen(0);
+zenData('story')->gen(0);
+zenData('user')->gen(5);
+su('admin');
+
+$projectTester = new projectZenTest();
+$result = $projectTester->processProjectListDataTest();
+r($result) && p('1:name,budget,storyPoints,estimate,consume,left') && e('瀑布项目2,$ 79.99万,0 h,0,0,0'); // 获取处理后的项目数据

module/project/zen.php

@@ -1380,7 +1380,7 @@ class projectZen extends project
                 if($story->isParent) continue;
                 $project->storyPoints += $story->estimate;
             }
-            $project->storyPoints .= ' ' . $this->config->hourUnit;
+            $project->storyPoints = helper::formatHours($project->storyPoints) . ' ' . $this->config->hourUnit;
 
             $executions = zget($executionGroup, $project->id, array());
             $project->executionCount = count($executions);