- + model == 'waterfallplus'):?>
programplan->typeList, $executionType);?> From e2a8d207cbb7ab4cb2752af5ab2117c8fa9fba4d Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 15 Feb 2023 08:26:32 +0000 Subject: [PATCH 16/16] * Fix bug of task #84599. --- module/execution/model.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index 2f506ae56d..8da37c25da 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1025,6 +1025,8 @@ class executionModel extends model ->remove('comment,readjustTime,readjustTask') ->get(); + if(empty($oldExecution->totalConsumed) and helper::isZeroDate($oldExecution->realBegan)) $execution->status = 'wait'; + if(!$this->post->readjustTime) { unset($execution->begin); @@ -5219,7 +5221,7 @@ class executionModel extends model /** * Generate col for dtable. - * + * * @access public * @return void */ @@ -5301,10 +5303,10 @@ class executionModel extends model /** * Generate row for dtable. - * - * @param array $executions - * @param array $users - * @param int $productID + * + * @param array $executions + * @param array $users + * @param int $productID * @access public * @return void */