diff --git a/module/product/test/model/getproductlink.php b/module/product/test/model/getproductlink.php index 8e71ffd9bc..ffcc9daef3 100644 --- a/module/product/test/model/getproductlink.php +++ b/module/product/test/model/getproductlink.php @@ -31,7 +31,7 @@ r($productModel->getProductLink('product', 'dynamic')) && p() && e('/pro r($productModel->getProductLink('project', 'bug')) && p() && e('/project-bug--%s.html'); //当前页面是project-bug,切换1.5级导航时跳转链接。 r($productModel->getProductLink('qa', 'index')) && p() && e('/bug-browse-%s.html'); //当前页面是qa-index,切换1.5级导航时跳转链接。 r($productModel->getProductLink('story', 'report')) && p() && e('/story-report-%s-all-.html'); //当前页面是story-report,切换1.5级导航时跳转链接。 -r($productModel->getProductLink('testcase', 'browse')) && p() && e('/testcase-browse-%s-all-.html'); //当前页面是testcase-browse,切换1.5级导航时跳转链接。 +r($productModel->getProductLink('testcase', 'browse')) && p() && e('/testcase-browse-%s-all.html'); //当前页面是testcase-browse,切换1.5级导航时跳转链接。 r($productModel->getProductLink('testreport', 'create')) && p() && e('/testreport-create--testtask-%s.html'); //当前页面是testreport-create,切换1.5级导航时跳转链接。 r($productModel->getProductLink('testreport', 'edit')) && p() && e('/testreport-browse-%s.html'); //当前页面是testreport-edit,切换1.5级导航时跳转链接。 r($productModel->getProductLink('testtask', 'browseUnits')) && p() && e('/testtask-browseUnits-%s-newest-id_desc-0-0-1.html'); //当前页面是testtask-browseUnits,切换1.5级导航时跳转链接。 diff --git a/module/product/test/model/getprojectstatsbyproduct.php b/module/product/test/model/getprojectstatsbyproduct.php index 2c01b6f310..57abc7f911 100755 --- a/module/product/test/model/getprojectstatsbyproduct.php +++ b/module/product/test/model/getprojectstatsbyproduct.php @@ -6,34 +6,34 @@ include dirname(__FILE__, 2) . '/product.class.php'; zdTable('product')->gen(50); zdTable('user')->gen(50); -$project = zdTable('project'); +$project = zdTable('project')->config('execution'); $project->PM->range('user2,user3'); $project->gen(50); $task = zdTable('task'); -$task->project->range('1-20'); -$task->gen(100); +$task->project->range('11,60,61,100'); +$task->gen(30); $team = zdTable('team'); -$team->root->range('1-50'); +$team->root->range('11,60,61,100'); $team->type->range('project'); -$team->account->range('admin,admin,user1,user1'); +$team->account->range('admin,user1,user2'); $team->days->range('5'); $team->hours->range('6,7'); -$team->gen(50); +$team->gen(12); $stakeholder = zdTable('stakeholder'); $stakeholder->objectType->range('project'); -$stakeholder->objectID->range('1-50'); +$stakeholder->objectID->range('11,60,61,100'); $stakeholder->user->range('user4,user5'); $stakeholder->type->range('inside'); $stakeholder->from->range(''); -$stakeholder->gen(50); +$stakeholder->gen(20); $projectproduct = zdTable('projectproduct'); $projectproduct->product->range('1-2'); -$projectproduct->project->range('1-50'); -$projectproduct->gen(50); +$projectproduct->project->range('11,60,61,100'); +$projectproduct->gen(8); /** @@ -46,5 +46,5 @@ pid=1 $product = new productTest('admin'); r($product->getProjectStatsByProductTest($productID = 0, 'all', '', false, 'order_desc')) && p() && e('0'); -r($product->getProjectStatsByProductTest($productID = 1, 'all', '', false, 'order_desc')) && p('11:totalConsumed,totalEstimate,totalLeft,progress,teamCount') && e('15,30,10,60,1'); -r($product->getProjectStatsByProductTest($productID = 1, 'all', '', true, 'order_desc')) && p('17:totalConsumed,totalEstimate,totalLeft,progress,teamCount') && e('45,27,11,80,1'); +r($product->getProjectStatsByProductTest($productID = 1, 'all', '', false, 'order_desc')) && p('11:totalConsumed,totalEstimate,totalLeft,progress,teamCount') && e('36,16,6,85.70,0'); +r($product->getProjectStatsByProductTest($productID = 1, 'all', '', true, 'order_desc')) && p('61:totalConsumed,totalEstimate,totalLeft,progress,teamCount') && e('45,40,34,56.90,0'); diff --git a/module/product/test/product.class.php b/module/product/test/product.class.php index be2062d6ad..850468973b 100644 --- a/module/product/test/product.class.php +++ b/module/product/test/product.class.php @@ -672,6 +672,7 @@ class productTest */ public function getProjectStatsByProductTest(int $productID, string $browseType = 'all', string $branch = '', bool $involved = false, string $orderBy = 'order_desc', object|null $pager = null): array { + $this->objectModel->loadModel('program')->refreshStats(true); $objects = $this->objectModel->getProjectStatsByProduct($productID, $browseType, $branch, $involved, $orderBy, $pager); $projects = array(); @@ -679,10 +680,10 @@ class productTest { $project = new stdclass(); $project->id = $object->id; - $project->totalConsumed = $object->hours->totalConsumed; - $project->totalEstimate = $object->hours->totalEstimate; - $project->totalLeft = $object->hours->totalLeft; - $project->progress = $object->hours->progress; + $project->totalConsumed = $object->consumed; + $project->totalEstimate = $object->estimate; + $project->totalLeft = $object->left; + $project->progress = $object->progress; $project->teamCount = $object->teamCount; $projects[$project->id] = $project; }