From 29375797df3c79f958df9457979667a5275f7d17 Mon Sep 17 00:00:00 2001 From: liyang <“liyang@easycorp.ltd”> Date: Tue, 22 Mar 2022 15:21:25 +0800 Subject: [PATCH 1/2] * update dept. --- test/class/dept.class.php | 45 +++++++++++++------ .../dept/creategroupmanagememberlink.php | 7 ++- .../dept/createmanageprojectadminlink.php | 6 ++- test/model/dept/getallchildid.php | 9 +++- test/model/dept/getsons.php | 8 +++- test/model/dept/traingoalmemberlink.php | 16 ------- 6 files changed, 55 insertions(+), 36 deletions(-) delete mode 100755 test/model/dept/traingoalmemberlink.php diff --git a/test/class/dept.class.php b/test/class/dept.class.php index 37e708d6d7..b88ccf7f6e 100644 --- a/test/class/dept.class.php +++ b/test/class/dept.class.php @@ -155,17 +155,17 @@ class deptTest return $objects; } - public function traingoalMemberLinkTest($dept, $planID) - { - $objects = $this->objectModel->traingoalMemberLink($dept, $planID); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function createGroupManageMemberLinkTest($dept, $groupID) + /** + * function createGroupManageMemberLink test by dept + * + * @param string $deptID + * @param string $groupID + * @access public + * @return string + */ + public function createGroupManageMemberLinkTest($deptID, $groupID) { + $dept = $this->objectModel->getByID($deptID); $objects = $this->objectModel->createGroupManageMemberLink($dept, $groupID); if(dao::isError()) return dao::getError(); @@ -173,8 +173,17 @@ class deptTest return $objects; } - public function createManageProjectAdminLinkTest($dept, $groupID) + /** + * function createManageProjectAdminLink test by dept + * + * @param string $deptID + * @param string $groupID + * @access public + * @return string + */ + public function createManageProjectAdminLinkTest($deptID, $groupID) { + $dept = $this->objectModel->getByID($deptID); $objects = $this->objectModel->createManageProjectAdminLink($dept, $groupID); if(dao::isError()) return dao::getError(); @@ -182,20 +191,30 @@ class deptTest return $objects; } - public function getSonsTest($deptID) + /** + * function getSons test by dept + * + * @param string $deptID + * @param string $count + * @access public + * @return array + */ + public function getSonsTest($deptID, $count) { $objects = $this->objectModel->getSons($deptID); if(dao::isError()) return dao::getError(); + if($count == '1') return count($objects); return $objects; } - public function getAllChildIdTest($deptID) + public function getAllChildIdTest($deptID, $count) { $objects = $this->objectModel->getAllChildId($deptID); if(dao::isError()) return dao::getError(); + if($count == '1') return count($objects); return $objects; } diff --git a/test/model/dept/creategroupmanagememberlink.php b/test/model/dept/creategroupmanagememberlink.php index 66a72b0f7a..ece877b4bc 100755 --- a/test/model/dept/creategroupmanagememberlink.php +++ b/test/model/dept/creategroupmanagememberlink.php @@ -11,6 +11,9 @@ pid=1 */ -$dept = new deptTest(); +$deptIDList = array('2', '5'); +$groupIDList = array('2', '12'); -r() && p() && e(); \ No newline at end of file +$dept = new deptTest(); +r($dept->createGroupManageMemberLinkTest($deptIDList[0], $groupIDList[0])) && p() && e('>开发部<'); //权限分组2开发部链接组成 +r($dept->createGroupManageMemberLinkTest($deptIDList[1], $groupIDList[1])) && p() && e('>开发部1<'); //权限分组12开发部1链接组成 diff --git a/test/model/dept/createmanageprojectadminlink.php b/test/model/dept/createmanageprojectadminlink.php index f9fbb34fc8..29132c1ca7 100755 --- a/test/model/dept/createmanageprojectadminlink.php +++ b/test/model/dept/createmanageprojectadminlink.php @@ -11,6 +11,10 @@ pid=1 */ +$deptIDList = array('2', '5'); +$groupIDList = array('2', '12'); + $dept = new deptTest(); +r($dept->createManageProjectAdminLinkTest($deptIDList[0], $groupIDList[0])) && p() && e('开发部'); //权限分组2开发部链接组成 +r($dept->createManageProjectAdminLinkTest($deptIDList[1], $groupIDList[1])) && p() && e('开发部1'); //权限分组2开发部链接组成 -r() && p() && e(); \ No newline at end of file diff --git a/test/model/dept/getallchildid.php b/test/model/dept/getallchildid.php index badd2ca1a0..4e30222b4c 100755 --- a/test/model/dept/getallchildid.php +++ b/test/model/dept/getallchildid.php @@ -11,6 +11,11 @@ pid=1 */ -$dept = new deptTest(); +$deptIDList = array('2', '5'); +$count = array('0', '1'); -r() && p() && e(); \ No newline at end of file +$dept = new deptTest(); +r($dept->getAllChildIdTest($deptIDList[0], $count[0])) && p('1') && e('5'); //有子部门查询 +r($dept->getAllChildIdTest($deptIDList[1], $count[0])[0]) && p() && e('5'); //无子部门查询 +r($dept->getAllChildIdTest($deptIDList[0], $count[1])) && p() && e('3'); //子部门数量统计 +r($dept->getAllChildIdTest($deptIDList[1], $count[1])) && p() && e('1'); //无子部门数量统计 diff --git a/test/model/dept/getsons.php b/test/model/dept/getsons.php index 590f4aa138..19043e6ecf 100755 --- a/test/model/dept/getsons.php +++ b/test/model/dept/getsons.php @@ -11,6 +11,10 @@ pid=1 */ -$dept = new deptTest(); +$deptIDList = array('2', '5'); +$count = array('0', '1'); -r() && p() && e(); \ No newline at end of file +$dept = new deptTest(); +r($dept->getSonsTest($deptIDList[0], $count[0])) && p('0:name,parent,path') && e('开发部1,2,,2,5,'); //有子部门查询 +r($dept->getSonsTest($deptIDList[1], $count[0])) && p() && e('0'); //无子部门查询 +r($dept->getSonsTest($deptIDList[0], $count[1])) && p() && e('2'); //子部门数量统计 diff --git a/test/model/dept/traingoalmemberlink.php b/test/model/dept/traingoalmemberlink.php deleted file mode 100755 index 6efe34dceb..0000000000 --- a/test/model/dept/traingoalmemberlink.php +++ /dev/null @@ -1,16 +0,0 @@ -traingoalMemberLink(); -cid=1 -pid=1 - -*/ - -$dept = new deptTest(); - -r() && p() && e(); \ No newline at end of file From ad24792c5ffbd4b794a87a15bbc69d4e83d61e7a Mon Sep 17 00:00:00 2001 From: liyang <“liyang@easycorp.ltd”> Date: Tue, 22 Mar 2022 17:10:32 +0800 Subject: [PATCH 2/2] update project data --- test/data/execution.yaml | 2 +- test/data/executionson.yaml | 2 +- test/data/project.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/data/execution.yaml b/test/data/execution.yaml index 33cc7708a3..0a2ba25a18 100644 --- a/test/data/execution.yaml +++ b/test/data/execution.yaml @@ -22,7 +22,7 @@ fields: - field: percent range: 0 - field: auth - range: + range: "extend" - field: desc range: 1-10000 prefix: "迭代描述" diff --git a/test/data/executionson.yaml b/test/data/executionson.yaml index 2384886896..39a5e92b83 100644 --- a/test/data/executionson.yaml +++ b/test/data/executionson.yaml @@ -22,7 +22,7 @@ fields: - field: percent range: 0 - field: auth - range: + range: "extend" - field: desc range: 1-10000 prefix: "迭代描述" diff --git a/test/data/project.yaml b/test/data/project.yaml index 8f42782bf7..b3febc956e 100644 --- a/test/data/project.yaml +++ b/test/data/project.yaml @@ -38,7 +38,7 @@ fields: range: - field: auth note: "Only project has auth" - range: + range: "extend" - field: parent range: 1-10 - field: path @@ -76,7 +76,7 @@ fields: - field: team range: - field: acl - range: open,private,custom + range: open,private,program - field: order range: 5-10000:5 - field: openedVersion