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

* Change function name from getBranchGroupByProject to getBranchGroup .

Browse Source
This commit is contained in:
guofeilong
2023-05-11 08:30:40 +08:00
parent 673535a421
commit 70c1dc1caa
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+1 -1
View File
@@ -504,7 +504,7 @@ class project extends control
$branches = $this->project->getBranchesByProject($projectID);
$linkedProductIdList = empty($branches) ? array() : array_keys($branches);
$linkedProducts = $this->loadModel('product')->getProducts($projectID, 'all', '', true);
$projectBranches = $this->project->getBranchGroupByProject($projectID, array_keys($linkedProducts));
$projectBranches = $this->project->getBranchGroup($projectID, array_keys($linkedProducts));
$allProducts = $this->program->getProductPairs($project->parent, 'all', 'noclosed', '', 0, $withProgram);
$plans = $this->loadModel('productplan')->getGroupByProduct(array_keys($linkedProducts), 'skipParent|unexpired');
module/project/model.php
+2 -2
View File
@@ -874,7 +874,7 @@ class projectModel extends model
/**
* 根据项目ID获取分支分组。
* Get branch group by project id.
* Get branch groups.
*
* @param int $projectID
* @param array $productIdList
@@ -882,7 +882,7 @@ class projectModel extends model
* @access public
* @return array
*/
public function getBranchGroupByProject(int $projectID, array $productIdList): array
public function getBranchGroup(int $projectID, array $productIdList): array
{
return $this->dao->select('t1.product as productID, t1.branch as branchID, t2.*')
->from(TABLE_PROJECTPRODUCT)->alias('t1')
module/project/test/model/getbranchgroupbyproject.php
+4 -4
View File
@@ -10,7 +10,7 @@ zdTable('projectproduct')->config('projectproduct')->gen(6);
/**
title=测试 projectModel->getBranchGroupByProject();
title=测试 projectModel->getBranchGroup();
timeout=0
cid=1
pid=1
@@ -21,9 +21,9 @@ global $tester;
$tester->loadModel('project');
$productIdList = array(1, 2, 3);
$project1 = $tester->project->getBranchGroupByProject(1, $productIdList);
$project2 = $tester->project->getBranchGroupByProject(2, $productIdList);
$project3 = $tester->project->getBranchGroupByProject(3, $productIdList);
$project1 = $tester->project->getBranchGroup(1, $productIdList);
$project2 = $tester->project->getBranchGroup(2, $productIdList);
$project3 = $tester->project->getBranchGroup(3, $productIdList);
r(key($project1[1])) && p('') && e('1'); // 获取id为1的项目的关联产品的分支数组，获取第一个数组的键
r(count($project1[1])) && p('') && e('3'); // 获取id为1的项目的关联产品的分支数组数量，按产品分组
module/project/zen.php
+1 -1
View File
@@ -773,7 +773,7 @@ class projectZen extends project
$allProducts = $this->loadModel('program')->getProductPairs($project->parent, 'all', 'noclosed', $linkedProductIdList);
$linkedProducts = $this->loadModel('product')->getProducts($projectID, 'all', '', true, $linkedProductIdList);
$projectStories = $this->project->getStoriesByProject($projectID);
$projectBranches = $this->project->getBranchGroupByProject($projectID, array_keys($linkedProducts));
$projectBranches = $this->project->getBranchGroup($projectID, array_keys($linkedProducts));
/* If the story of the product which linked the project,don't allow to remove the product. */
$unmodifiableProducts = array();