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

Merge branch 'sprint/220_tianshujie_burn' into 'master'

Browse Source 
*Fix bug #25712.

See merge request easycorp/zentaopms!4666
This commit is contained in:
王怡栋
2022-07-26 09:26:31 +00:00
parent ba89545efb a84a4098e9
commit f56ba3313d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+4 -2
View File
@@ -3248,6 +3248,7 @@ class executionModel extends model
}
$current = $begin;
$today = helper::today();
$endTime = strtotime($end);
$preValue = 0;
$todayTag = 0;
@@ -3261,18 +3262,19 @@ class executionModel extends model
{
$currentTime = strtotime($current);
if($currentTime > $endTime) break;
if(isset($sets[$current])) $preValue = $sets[$current]->value;
if($currentTime > time() and !$todayTag)
{
$todayTag = $i + 1;
}
if(isset($sets[$current])) $preValue = $sets[$current]->value;
if(!isset($sets[$current]) and $mode == 'noempty')
{
$sets[$current] = new stdclass();
$sets[$current]->name = $current;
$sets[$current]->value = $preValue;
$sets[$current]->value = helper::diffDate($current, $today) < 0 ? $preValue : 'null';
}
$nextDay = date(DT_DATE1, $currentTime + 24 * 3600);
$current = $nextDay;
}