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

* Merge the if condition for function getBeginEnd4CFD.

Browse Source
This commit is contained in:
liyang
2023-05-10 09:45:50 +08:00
parent fcf51883a1
commit 4b7b080d14
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+6 -9
View File
@@ -4025,17 +4025,14 @@ class executionModel extends model
foreach($dateList as $date)
{
if(!isset($burnData[$date]))
if(!isset($burnData[$date]) && ($showDelay ? $date >= $execution->end : $date <= $execution->end))
{
if(($showDelay and $date < $execution->end) or (!$showDelay and $date > $execution->end))
{
$set = new stdClass();
$set->name = $date;
$set->value = 'null';
$set->$burnBy = 0;
$set = new stdclass();
$set->name = $date;
$set->value = 'null';
$set->$burnBy = 0;
$burnData[$date] = $set;
}
$burnData[$date] = $set;
}
}