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

Merge branch '15.6' into sprint/167

Browse Source
This commit is contained in:
王怡栋
2021-10-15 13:11:52 +08:00
parent fae6d95bfe 8e38b12360
commit 8ee2811723
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/model.php
+7 -3
View File
@@ -1249,9 +1249,13 @@ class programModel extends model
$hour = (object)$emptyHour;
foreach($projectTasks as $task)
{
$hour->totalConsumed += $task->consumed;
if(isset($executions[$task->execution])) $hour->totalEstimate += $task->estimate;
if($task->status != 'cancel' and $task->status != 'closed' and isset($executions[$task->execution])) $hour->totalLeft += $task->left;
if(isset($executions[$task->execution]))
{
$hour->totalConsumed += $task->consumed;
$hour->totalEstimate += $task->estimate;
if(strpos('cancel,closed', $task->status) !== false) $hour->totalLeft += $task->left;
}
}
$hours[$projectID] = $hour;
}