Merge branch 'feature/workflow' into main

This commit is contained in:
sunguangming
2024-10-23 03:11:44 +00:00
77 changed files with 698 additions and 281 deletions
+6 -9
View File
@@ -56,15 +56,12 @@ $cols = $this->loadModel('datatable')->getSetting('execution');
if($execution->type != 'stage') unset($cols['design']);
$tableData = initTableData($tasks, $cols, $this->task);
$tableData = array_map(
function($task)
{
if(helper::isZeroDate($task->deadline)) $task->deadline = '';
if(helper::isZeroDate($task->estStarted)) $task->estStarted = '';
return $task;
},
$tableData
);
foreach($tableData as $task)
{
$task->status = $this->processStatus('task', $task);
if(helper::isZeroDate($task->deadline)) $task->deadline = '';
if(helper::isZeroDate($task->estStarted)) $task->estStarted = '';
}
if($config->edition == 'ipd')
{