Merge branch 'master_xieqiyu_showDeadline' into 'master'

* Show execution deadline at burn in view page.

See merge request easycorp/zentaopms!3415
This commit is contained in:
王怡栋
2022-05-16 03:15:17 +00:00
+1 -1
View File
@@ -2021,7 +2021,7 @@ class execution extends control
$deadline = $execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate;
$deadline = strpos('closed,suspended', $execution->status) === false ? helper::today() : $deadline;
$endDate = strpos($type, 'withdelay') !== false ? $deadline : $execution->end;
list($dateList, $interval) = $this->execution->getDateList($execution->begin, $endDate, $type, 0, 'Y-m-d');
list($dateList, $interval) = $this->execution->getDateList($execution->begin, $endDate, $type, 0, 'Y-m-d', $execution->end);
$chartData = $this->execution->buildBurnData($executionID, $dateList, $type);
/* Load pager. */