* Finish task #44002, #44003...

This commit is contained in:
孙广明
2021-11-08 13:12:25 +08:00
parent 143abdf45b
commit 3965d5339b
4 changed files with 22 additions and 13 deletions
+13 -9
View File
@@ -166,10 +166,14 @@ class programModel extends model
->andWhere('program')->in(array_keys($programs))
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
->andWhere('status')->ne('closed')
->fetchGroup('program', 'id');
->orderBy('order_asc')
->fetchGroup('program');
$productPairs = array();
foreach($productGroup as $programID => $products) $productPairs = array_merge($productPairs, array_keys($products));
foreach($productGroup as $programID => $products)
{
foreach($products as $product) $productPairs[$product->id] = $product->id;
}
/* Get all plans under products. */
$plans = $this->dao->select('id, product, title')->from(TABLE_PRODUCTPLAN)
@@ -225,11 +229,11 @@ class programModel extends model
/* Group data by product. */
foreach($productGroup as $programID => $products)
{
foreach($products as $productID => $product)
foreach($products as $product)
{
$product->plans = zget($plans, $productID, array());
$product->releases = zget($releases, $productID, array());
$projects = zget($projectGroup, $productID, array());
$product->plans = zget($plans, $product->id, array());
$product->releases = zget($releases, $product->id, array());
$projects = zget($projectGroup, $product->id, array());
foreach($projects as $project)
{
if(helper::diffDate(helper::today(), $project->end) > 0) $project->delay = 1;
@@ -259,11 +263,11 @@ class programModel extends model
if(in_array($programID, $involvedPrograms))
{
$kanbanGroup['my'][$programID] = $programGroup;
$kanbanGroup['my'][] = $programGroup;
}
else
{
$kanbanGroup['others'][$programID] = $programGroup;
$kanbanGroup['others'][] = $programGroup;
}
}
@@ -894,7 +898,7 @@ class programModel extends model
->beginIF(!$isQueryAll)->andWhere('id')->in($this->app->user->view->programs)->fi()
->andWhere('deleted')->eq(0)
->beginIF($model)->andWhere('model')->eq($model)->fi()
->orderBy('`order`')
->orderBy('`order` asc')
->fetchPairs();
}