Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch release/21.7.8 of zentao/zentaopms (#12665)

Browse Source
This commit is contained in:
刘刚
2025-12-05 10:26:51 +08:00
committed by Gitfox
parent 97d0b13590 99d0c3430c
commit 88d30cbaf2
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/zentao.sql
+18 -18
View File
@@ -2291,8 +2291,8 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` (
`status` varchar(10) NOT NULL DEFAULT 'wait' COMMENT '状态',
`testreport` int unsigned NOT NULL DEFAULT 0 COMMENT '相关联的测试报告',
`auto` varchar(10) NOT NULL DEFAULT 'no' COMMENT '是否为自动化测试',
`subStatus` varchar(30) NOT NULL DEFAULT '' COMMENT '子状态',,
`createdBy` varchar(30) NOT NULL DEFAULT '' COMMENT '由谁创建',,
`subStatus` varchar(30) NOT NULL DEFAULT '' COMMENT '子状态',
`createdBy` varchar(30) NOT NULL DEFAULT '' COMMENT '由谁创建',
`createdDate` datetime DEFAULT NULL COMMENT '创建时间',
`members` text DEFAULT NULL COMMENT '团队成员',
`deleted` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '是否删除',
@@ -2598,22 +2598,22 @@ REPLACE INTO `zt_stage` (`name`,`percent`,`type`,`projectType`,`createdBy`,`crea
('总结评审','5','review','waterfallplus','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0');
REPLACE INTO `zt_config` (`vision`, `owner`, `module`, `section`, `key`, `value`) VALUES
('', 'system', 'common', '', 'CRProduct', '1');
('', 'system', 'common', '', 'CRExecution', '1');
('', 'system', 'common', '', 'closedFeatures', 'otherOA');
('', 'system', 'common', 'global', 'mode', 'ALM');
('', 'system', 'common', 'global', 'syncProduct', '{"feedback":{},"ticket":{}}');
('', 'system', 'common', 'global', 'installedDate', CURDATE());
('', 'system', 'custom', '', 'enableER', '1');
('', 'system', 'custom', '', 'hourPoint', '0');
('', 'system', 'custom', '', 'URSR', '2');
('', 'system', 'project', '', 'defaultCurrency', 'CNY');
('', 'system', 'project', '', 'unitList', 'CNY,USD');
('', 'system', 'epic', '', 'gradeRule', 'stepwise');
('', 'system', 'requirement', '', 'gradeRule', 'stepwise');
('', 'system', 'story', '', 'gradeRule', 'stepwise');
('', 'system', 'story', '', 'reviewRules', 'allpass');
('or', 'system', 'demand', '', 'reviewRules', 'allpass');
('', 'system', 'common', '', 'CRProduct', '1'),
('', 'system', 'common', '', 'CRExecution', '1'),
('', 'system', 'common', '', 'closedFeatures', 'otherOA'),
('', 'system', 'common', 'global', 'mode', 'ALM'),
('', 'system', 'common', 'global', 'syncProduct', '{"feedback":{},"ticket":{}}'),
('', 'system', 'common', 'global', 'installedDate', CURDATE()),
('', 'system', 'custom', '', 'enableER', '1'),
('', 'system', 'custom', '', 'hourPoint', '0'),
('', 'system', 'custom', '', 'URSR', '2'),
('', 'system', 'project', '', 'defaultCurrency', 'CNY'),
('', 'system', 'project', '', 'unitList', 'CNY,USD'),
('', 'system', 'epic', '', 'gradeRule', 'stepwise'),
('', 'system', 'requirement', '', 'gradeRule', 'stepwise'),
('', 'system', 'story', '', 'gradeRule', 'stepwise'),
('', 'system', 'story', '', 'reviewRules', 'allpass'),
('or', 'system', 'demand', '', 'reviewRules', 'allpass'),
('or', 'system', 'demand', '', 'needReview', '1');
-- DROP TABLE IF EXISTS `zt_relationoftasks`;
module/programplan/tao.php
+1
View File
@@ -111,6 +111,7 @@ class programplanTao extends programplanModel
*/
protected function getParentStages(int $executionID, int $planID, int $productID, string $param = ''): array|false
{
dao::$filterTpl = 'skip';
$parentStage = $this->dao->select('t1.id, t1.name')->from(TABLE_PROJECT)->alias('t1')
->beginIF($productID)
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project')