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

Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'

Browse Source 
* Finish task #73241.

See merge request easycorp/zentaopms!5889
This commit is contained in:
孙广明
2022-10-27 01:03:26 +00:00
parent 7299a84a97 ba55e70ae2
commit 7a4179a210
10 changed files with 71 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+11 -2
View File
@@ -1046,10 +1046,19 @@ class project extends control
$this->view->title = $this->lang->execution->allExecutions;
$this->view->position[] = $this->lang->execution->allExecutions;
$executionStats = $this->execution->getStatData($projectID, $status, $productID, 0, $this->cookie->showTask, '', $orderBy, $pager);
$showToggleIcon = false;
$executionStats = $this->execution->getStatData($projectID, $status, $productID, 0, $this->cookie->showTask, '', $orderBy, $pager);
$showToggleIcon = false;
$productNameList = $this->dao->select('t1.id,GROUP_CONCAT(t3.`name`) as productName')->from(TABLE_EXECUTION)->alias('t1')
->leftjoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id=t2.project')
->leftjoin(TABLE_PRODUCT)->alias('t3')->on('t2.product=t3.id')
->where('t1.project')->eq($projectID)
->andWhere('t1.type')->eq('stage')
->groupBy('t1.id')
->fetchPairs();
foreach($executionStats as $execution)
{
$execution->productName = isset($productNameList[$execution->id]) ? $productNameList[$execution->id] : '';
if(!empty($execution->tasks) or !empty($execution->children))
{
$showToggleIcon = true;