Merge branch 'autotest_ly' into 'master'

add project and product data

See merge request easycorp/zentaopms!2559
This commit is contained in:
孙广明
2022-03-28 00:41:34 +00:00
6 changed files with 206 additions and 13 deletions
+95
View File
@@ -0,0 +1,95 @@
title: table zt_product
desc: "产品"
author: automated export
version: "1.0"
fields:
- field: id
range: 101-1000
- field: program
note: "所属项目集"
range: 0-10
- field: name
note: "产品名称"
range: 1-100
prefix: "产品"
- field: code
note: "产品代号"
fields:
- field: code1
range: code
- field: code2
range: 300-1000
- field: line
note: "产品线"
range: 0-10
- field: type
note: "产品类型"
range: normal{40}
- field: status
note: "状态"
range: normal{20}
- field: subStatus
note: "子状态"
range: 0
- field: desc
note: "产品描述"
fields:
- field: desc1
range: []{30},产品描述{20}
- field: desc2
range: <div>
<p><h1>一、禅道项目管理软件是做什么的?</h1>
禅道由 青岛易软天创网络科技有限公司开发,国产开源项目管理软件。它集产品管理、项目管理、质量管理、文档管理、组织管理和事务管理于一体,是一款专业的研发项目管理软件,完整覆盖了研发项目管理的核心流程。禅道管理思想注重实效,功能完备丰富,操作简洁高效,界面美观大方,搜索功能强大,统计报表丰富多样,软件架构合理,扩展灵活,有完善的API可以调用。禅道,专注研发项目管理
</p>
<p>我是数字符号23@#$%#^$ </p>
<p>我是英文dashcuscbrewg </p>
</div>{30},
1-20
- field: PO
note: "产品负责人"
fields:
- field: po1
range: po{120},[]{7}
- field: po2
range: 1-10{12!},[]{7}
- field: QD
note: "测试负责人"
fields:
- field: account1
range: test{120},[]{7}
- field: account2
range: 1-100,1-20,[]{7}
- field: RD
note: "发布负责人"
fields:
- field: dev1
range: dev{120},[]{7},dev{80}
- field: dev2
range: 1-120,[]{7},121-200
- field: acl
note: "访问控制"
range: open{10},private{10},open{10},private{10},open{10},private{10},open{10},private{10},open{10},private{10},open{10},private{10},open{5},private{5},open{5},private{5},open{5},private{5},open{5},private{5},open{5},private{5},open{5},private{5},open{20}
- field: whitelist
note: "分组白名单"
range: []{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{7},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{3},[]{20}
- field: createdBy
note: "创建者"
fields:
- field: createdBy1
range: po
- field: createdBy2
range: 1-10
- field: createdDate
note: "创建日期"
range: "-:60"
type: timestamp
format: "YYYY-MM-DD hh:mm:ss"
- field: createdVersion
note: "创建版本"
range: 15.6
- field: order
note: "排序"
range: 5-10000:5
- field: deleted
note: "是否删除"
range: 0
+80
View File
@@ -0,0 +1,80 @@
title: table zt_project
author: Zhu Jinyong
version: "1.0"
fields:
- field: id
range: 731-750
- field: project
range: 0
- field: model
range: scrum
- field: name
note: "名称"
fields:
- field: name1
range: '独立项目'
- field: name2
range: 1-10000
- field: type
range: project
- field: status
range: wait
- field: lifetime
range:
- field: budget
range: 0
- field: budgetUnit
range: CNY,USD
- field: attribute
note: "Only stage has attribute"
range:
- field: percent
range: 1-100
- field: milestone
note: "Is it milestone"
range: 0
- field: output
note: "Output document"
range:
- field: auth
note: "Only project has auth"
range: "extend"
- field: parent
range: 0
- field: path
range: 731-750
prefix: ","
postfix: ","
- field: grade
range: "1"
- field: code
range: 101-1000
prefix: "project"
- field: begin
range: "(-2M)-(+M):1D"
type: timestamp
format: "YY/MM/DD"
postfix: "\t"
- field: end
range: "(+1w)-(+2M):1D"
type: timestamp
format: "YY/MM/DD"
postfix: "\t"
- field: PO
range:
- field: PM
range:
- field: QD
range:
- field: RD
range:
- field: team
range:
- field: acl
range: open,private,program
- field: order
range: 5-10000:5
- field: openedVersion
range: "16.5"
- field: deleted
range: 0
+12
View File
@@ -0,0 +1,12 @@
title: zt_projectproduct
desc: 项目关联产品表
version: 1.0
fields:
- field: project
range: 731-732{5},733-750
- field: product
range: 101-110,111-112{5},113-120
- field: branch
range: 0
- field: plan
range: 0
+5 -2
View File
@@ -164,8 +164,11 @@ fields:
format: ""
- field: assignedTo
note: "指派给"
from: common.user.v1.yaml
use: user
fields:
- field: openedBy1
range: admin,user,test,dev
- field: openedBy2
range: [],2-4
prefix: ""
postfix: ""
loop: 0
+13 -10
View File
@@ -12,9 +12,10 @@ $builder->userview = array('rows' => 400, 'extends' => array('userview'));
$builder->dept = array('rows' => 100, 'extends' => array('dept'));
$builder->action = array('rows' => 100, 'extends' => array('action'));
$builder->program = array('rows' => 10, 'extends' => array('project', 'program'));
$builder->project = array('rows' => 90, 'extends' => array('project', 'project'));
$builder->sprint = array('rows' => 600, 'extends' => array('project', 'execution'));
$builder->program = array('rows' => 10, 'extends' => array('project', 'program'));
$builder->project = array('rows' => 90, 'extends' => array('project', 'project'));
$builder->projectalone = array('rows' => 20, 'extends' => array('project', 'projectalone'));
$builder->sprint = array('rows' => 600, 'extends' => array('project', 'execution'));
$builder->story = array('rows' => 400, 'extends' => array('story'));
$builder->childstory = array('rows' => 50, 'extends' => array('story','childstory'));
@@ -39,13 +40,15 @@ $builder->testtask = array('rows' => 10, 'extends' => array('testtask'));
$builder->testresult = array('rows' => 40, 'extends' => array('testresult'));
$builder->testrun = array('rows' => 40, 'extends' => array('testrun'));
$builder->product = array('rows' => 100, 'extends' => array('product'));
$builder->productline = array('rows' => 20, 'extends' => array('module', 'productline'));
$builder->productplan = array('rows' => 70, 'extends' => array('productplan'));
$builder->branch = array('rows' => 240, 'extends' => array('branch'));
$builder->projectproduct = array('rows' => 200, 'extends' => array('projectproduct'));
$builder->projectstory = array('rows' => 200, 'extends' => array('projectstory'));
$builder->executionstory = array('rows' => 180, 'extends' => array('projectstory','executionstory'));
$builder->product = array('rows' => 100, 'extends' => array('product'));
$builder->productalone = array('rows' => 20, 'extends' => array('product','productalone'));
$builder->productline = array('rows' => 20, 'extends' => array('module', 'productline'));
$builder->productplan = array('rows' => 70, 'extends' => array('productplan'));
$builder->branch = array('rows' => 240, 'extends' => array('branch'));
$builder->projectproduct = array('rows' => 200, 'extends' => array('projectproduct'));
$builder->projectproductalone = array('rows' => 28, 'extends' => array('projectproduct','projectproductalone'));
$builder->projectstory = array('rows' => 200, 'extends' => array('projectstory'));
$builder->executionstory = array('rows' => 180, 'extends' => array('projectstory','executionstory'));
$builder->kanbanspace = array('rows' => 50, 'extends' => array('kanbanspace'));
$builder->kanban = array('rows' => 100, 'extends' => array('kanban'));
+1 -1
View File
@@ -285,7 +285,7 @@ class Processor
private function initStakeholder()
{
/* Add stakeholder of project. */
$projectProgramPairs = $this->dao->select('id,type')->from(TABLE_PROJECT)->where('type')->in('project,program')->fetchPairs();
$projectProgramPairs = $this->dao->select('id,type')->from(TABLE_PROJECT)->where('type')->in('project,program')->andwhere('id')->lt('730')->fetchPairs();
$accounts = $this->dao->select('id,account')->from(TABLE_USER)->fetchPairs();
foreach($projectProgramPairs as $id => $type)