diff --git a/module/programplan/test/tao/buildganttdata4ipd.php b/module/programplan/test/tao/buildganttdata4ipd.php index e9c880e83b..98d959f663 100644 --- a/module/programplan/test/tao/buildganttdata4ipd.php +++ b/module/programplan/test/tao/buildganttdata4ipd.php @@ -7,7 +7,7 @@ title=测试 loadModel->buildGanttData4IPD() cid=0 - 禅道版本为开源版。 @0 -- gantt数据数。 @20 +- gantt数据数。 @11 - 禅道版本为IPD。 - 属性id @1-PP-1 - 属性reviewID @1 @@ -21,7 +21,6 @@ include dirname(__FILE__, 5). '/test/lib/init.php'; su('admin'); zenData('review')->gen(20); -zenData('object')->gen(20); $project = zenData('project'); $project->type->range('stage'); $project->attribute->range('devel'); @@ -29,13 +28,13 @@ $project->begin->range('`2023-09-28`'); $project->end->range('`2024-04-02`'); $project->gen(10); +$object = zenData('object'); +$object->execution->range('1-20'); +$object->gen(20); + global $tester; $tester->loadModel('programplan'); -$tester->programplan->app->loadConfig('review'); -$tester->programplan->config->review->ipdReviewPoint = new stdclass(); -$tester->programplan->config->review->ipdReviewPoint->devel = array('PP'); - $plans = $tester->programplan->dao->select('*')->from(TABLE_PROJECT)->where('type')->eq('stage')->fetchAll('id'); $plans = $tester->programplan->processPlans($plans); @@ -47,7 +46,7 @@ r(isset($datas['data']['1-PP-1'])) && p() && e("0"); //禅道版本为开源版 $tester->programplan->config->edition = 'ipd'; $datas = $tester->programplan->buildGanttData4IPD($normalResult['datas'], 1, 1, 'point', $normalResult['reviewDeadline']); -r(count($datas['data'])) && p() && e('20'); //gantt数据数。 +r(count($datas['data'])) && p() && e('11'); //gantt数据数。 r($datas['data']['1-PP-1']) && p('id,reviewID,type,text') && e("1-PP-1,1,point, 这个是评审或基线的标题1"); //禅道版本为IPD。 $datas = $tester->programplan->buildGanttData4IPD($normalResult['datas'], 1, 1, '', $normalResult['reviewDeadline']);