diff --git a/module/metric/calc/global/rate/rate_of_annual_delivered_story.php b/module/metric/calc/global/rate/rate_of_annual_delivered_story.php index 4aed84cc9f..3a2aa2a1c6 100644 --- a/module/metric/calc/global/rate/rate_of_annual_delivered_story.php +++ b/module/metric/calc/global/rate/rate_of_annual_delivered_story.php @@ -26,12 +26,12 @@ class rate_of_annual_delivered_story extends baseCalc public $fieldList = array('t1.stage', 't1.releasedDate', 't1.closedReason', 't1.closedDate'); - public function calculate($data) + public function calculate($row) { - $stage = $data->stage; - $closedReason = $data->closedReason; - $releasedDate = $data->releasedDate; - $closedDate = $data->closedDate; + $stage = $row->stage; + $closedReason = $row->closedReason; + $releasedDate = $row->releasedDate; + $closedDate = $row->closedDate; $date = null; if($closedReason == 'done') $date = $closedDate; diff --git a/module/metric/test/calc/global/rate/rate_of_annual_delivered_story.php b/module/metric/test/calc/global/rate/rate_of_annual_delivered_story.php new file mode 100755 index 0000000000..166984ae70 --- /dev/null +++ b/module/metric/test/calc/global/rate/rate_of_annual_delivered_story.php @@ -0,0 +1,23 @@ +#!/usr/bin/env php +config('product', $useCommon = true, $levels = 4)->gen(10); +zdTable('story')->config('story_status_closedreason', $useCommon = true, $levels = 4)->gen(1000); + +$metric = new metricTest(); +$calc = $metric->calcMetric(__FILE__); + +/** + +title=rate_of_annual_delivered_story +timeout=0 +cid=1 + +*/ + +r($calc->getResult(array('year' => '2011'))) && p('0:value') && e('1'); // 测试2011年研发需求交付率。 +r($calc->getResult(array('year' => '2014'))) && p('0:value') && e('1'); // 测试2014年研发需求交付率。 +r($calc->getResult(array('year' => '2015'))) && p('0:value') && e('1'); // 测试2015年研发需求交付率。 +r($calc->getResult(array('year' => '2099'))) && p('') && e('0'); // 测试错误的年份。