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

* finish task #40911.

Browse Source
This commit is contained in:
wangyidong
2021-08-03 15:33:32 +08:00
parent a40762cb98
commit 7907a29cf8
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/report/model.php
+5 -5
View File
@@ -642,7 +642,7 @@ class reportModel extends model
}
/**
* Get count of created story,plan and finished story by accounts every product in this year.
* Get count of created story,plan and closed story by accounts every product in this year.
*
* @param array $accounts
* @param int $year
@@ -709,7 +709,7 @@ class reportModel extends model
->groupBy('product')
->fetchAll('product');
$closedStoryStats = $this->dao->select("product,sum(if((status = 'closed'), 1, 0)) as finished")->from(TABLE_STORY)
$closedStoryStats = $this->dao->select("product,sum(if((status = 'closed'), 1, 0)) as closed")->from(TABLE_STORY)
->where('product')->in(array_keys($products))
->andWhere('deleted')->eq(0)
->andWhere('LEFT(closedDate, 4)')->eq($year)
@@ -717,13 +717,13 @@ class reportModel extends model
->groupBy('product')
->fetchAll('product');
/* Merge created plan, created story and finished story in every product. */
/* Merge created plan, created story and closed story in every product. */
foreach($products as $productID => $product)
{
$product->plan = 0;
$product->requirement = 0;
$product->story = 0;
$product->finished = 0;
$product->closed = 0;
$plans = zget($planGroups, $productID, array());
if($plans) $product->plan = count($plans);
@@ -736,7 +736,7 @@ class reportModel extends model
}
$closedStoryStat = zget($closedStoryStats, $productID, '');
if($closedStoryStat) $product->finished = $closedStoryStat->finished;
if($closedStoryStat) $product->closed = $closedStoryStat->closed;
}
return $products;