diff --git a/db/zentao.sql b/db/zentao.sql index 864c007504..98e721fb87 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1991,6 +1991,7 @@ CREATE TABLE IF NOT EXISTS `zt_stage` ( `name` varchar(255) NOT NULL DEFAULT '', `percent` varchar(255) NOT NULL DEFAULT '', `type` varchar(255) NOT NULL DEFAULT '', + `projectType` varchar(255) NOT NULL DEFAULT '', `createdBy` varchar(30) NOT NULL DEFAULT '', `createdDate` datetime NULL, `editedBy` varchar(30) NOT NULL DEFAULT '', diff --git a/module/stage/model.php b/module/stage/model.php index b9b34bf590..669d036bc8 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -278,7 +278,7 @@ class stageModel extends model $builtinStage->createdDate = helper::now(); $builtinStage->name = in_array($workflowGroup->projectModel, array('waterfall', 'waterfallplus')) ? zget($this->lang->stage->typeList, $stageType, '') : zget($this->lang->stage->ipdTypeList, $stageType, ''); $builtinStage->type = $stageType; - $builtinStage->projectType = $workflowGroup->projectType; + $builtinStage->projectType = $workflowGroup->projectModel; $this->dao->insert(TABLE_STAGE)->data($builtinStage)->exec(); $stageID = $this->dao->lastInsertID(); diff --git a/module/stage/test/model/addbuiltinpoint.php b/module/stage/test/model/addbuiltinpoint.php index e00d4983bf..3711d530f0 100755 --- a/module/stage/test/model/addbuiltinpoint.php +++ b/module/stage/test/model/addbuiltinpoint.php @@ -45,10 +45,6 @@ cid=1 - 第10条的title属性 @ADCP - 第10条的type属性 @DCP - 第10条的category属性 @ADCP -- 获取LDCP评审点 - - 第11条的title属性 @LDCP - - 第11条的type属性 @DCP - - 第11条的category属性 @LDCP */ @@ -82,4 +78,3 @@ r($IPDpoint) && p('7:title,type,category') && e('TR4A,TR,TR4A'); //获取TR4A r($IPDpoint) && p('8:title,type,category') && e('TR5,TR,TR5'); //获取TR5评审点 r($IPDpoint) && p('9:title,type,category') && e('TR6,TR,TR6'); //获取TR6评审点 r($IPDpoint) && p('10:title,type,category') && e('ADCP,DCP,ADCP'); //获取ADCP评审点 -r($IPDpoint) && p('11:title,type,category') && e('LDCP,DCP,LDCP'); //获取LDCP评审点