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/model.php
+6 -3
View File
@@ -958,10 +958,11 @@ class productModel extends model
* @param string $browseType
* @param int $branch
* @param int $involved
* @param string $orderBy
* @access public
* @return array
*/
public function getProjectListByProduct($productID, $browseType = 'all', $branch = 0, $involved = 0)
public function getProjectListByProduct($productID, $browseType = 'all', $branch = 0, $involved = 0, $orderBy = 'order_desc')
{
$projectList = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
@@ -978,6 +979,7 @@ class productModel extends model
->fi()
->beginIF($branch)->andWhere('t1.branch')->in($branch)->fi()
->andWhere('t2.deleted')->eq('0')
->orderBy($orderBy)
->fetchAll('id');
/* Determine how to display the name of the program. */
@@ -998,12 +1000,13 @@ class productModel extends model
* @param string $browseType
* @param int $branch
* @param int $involved
* @param string $orderBy
* @access public
* @return array
*/
public function getProjectStatsByProduct($productID, $browseType = 'all', $branch = 0, $involved = 0)
public function getProjectStatsByProduct($productID, $browseType = 'all', $branch = 0, $involved = 0, $orderBy = 'order_desc')
{
$projects = $this->getProjectListByProduct($productID, $browseType, $branch, $involved);
$projects = $this->getProjectListByProduct($productID, $browseType, $branch, $involved, $orderBy);
if(empty($projects)) return array();
$projectKeys = array_keys($projects);