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

Merge remote-tracking branch 'origin/master' into Merge184

Browse Source
This commit is contained in:
tanghucheng
2023-11-21 19:43:29 -05:00
parent 03bb2496a2 55b76ba55a
commit d20ef33df8
149 changed files with 1597 additions and 1842 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/api/v1/entries/product.php
+1 -6
View File
@@ -76,7 +76,7 @@ class productEntry extends entry
$product->actions = $this->loadModel('action')->processActionForAPI($actions, $users, $this->lang->product);
break;
case 'lastexecution':
$execution = $this->dao->select('t2.id,t2.name,t2.type')->from(TABLE_PROJECTPRODUCT)->alias('t1')
$execution = $this->dao->select('t2.id,t2.name,t2.type,t2.progress')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where('t2.deleted')->eq(0)
->andWhere('t1.product')->eq($productID)
@@ -84,11 +84,6 @@ class productEntry extends entry
->orderBy('t2.id desc')
->limit(1)
->fetch();
if($execution)
{
$workhour = $this->loadModel('project')->computeProgress(array($execution->id => $execution));
if(isset($workhour[$execution->id])) $execution->progress = $workhour[$execution->id]->progress;
}
$product->lastExecution = $execution;
break;