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

Merge branch 'sprint/app10'

Browse Source
This commit is contained in:
王怡栋
2021-11-25 10:25:05 +08:00
parent a83f2d8ce9 57c6ae78a8
commit 9a80f35962
25 changed files with 410 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+7 -6
View File
@@ -69,14 +69,15 @@ class product extends control
/**
* The projects which linked the product.
*
* @param string $status
* @param int $productID
* @param int|string $branch
* @param int $involved
* @param string $status
* @param int $productID
* @param int $branch
* @param int $involved
* @param string $orderBy
* @access public
* @return void
*/
public function project($status = 'all', $productID = 0, $branch = '', $involved = 0)
public function project($status = 'all', $productID = 0, $branch = '', $involved = 0, $orderBy = 'order_desc')
{
$this->app->loadLang('execution');
$this->app->loadLang('project');
@@ -88,7 +89,7 @@ class product extends control
/* Get PM id list. */
$accounts = array();
$projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $involved);
$projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $involved, $orderBy);
foreach($projectStats as $project)
{