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

* Adjust execution error.

Browse Source
This commit is contained in:
caoyanyi
2023-12-01 09:18:45 +08:00
parent 49f7424fdf
commit 08ddfcb200
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+2 -4
View File
@@ -1603,19 +1603,17 @@ class executionModel extends model
{
if(empty($executions)) return $executions;
$memberGroup = $this->executionTao->getMemberCountGroup(array_keys($executions)); // Get execution team member count.
$productList = $this->executionTao->getProductList($projectID); // Get product name of the linked execution.
if($withTasks) $executionTasks = $this->getTaskGroupByExecution(array_keys($executions));
$parentList = array();
$emptyHour = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0);
$today = helper::today();
$burns = $this->getBurnData($executions);
foreach($executions as $execution)
{
$execution->productName = isset($productList[$execution->id]) ? trim($productList[$execution->id]->productName, ',') : '';
$execution->end = date(DT_DATE1, strtotime($execution->end));
if($execution->end) $execution->end = date(DT_DATE1, strtotime($execution->end));
if(isset($executions[$execution->parent])) $executions[$execution->parent]->isParent = 1;
if(empty($productID) && !empty($productList[$execution->id])) $execution->product = trim($productList[$execution->id]->product, ',');
@@ -2331,7 +2329,7 @@ class executionModel extends model
{
if(!isset($existedProducts[$productID])) $existedProducts[$productID] = array();
$oldPlan = 0;
$oldPlan = '';
$branch = isset($branches[$i]) ? (array)$branches[$i] : array(0);
foreach($branch as $branchID)
{