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

* fix bug #33393.

Browse Source
This commit is contained in:
wangyidong
2023-04-20 14:39:46 +08:00
parent 23afc42e5b
commit a8f88d0178
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+7 -7
View File
@@ -524,8 +524,8 @@ class taskModel extends model
if($oldParentTask->parent == 0 and $oldParentTask->consumed > 0)
{
$clonedTask = clone $oldParentTask;
unset($clonedTask->id);
$clonedTask->parent = $parentID;
unset($clonedTask->id);
$this->dao->insert(TABLE_TASK)->data($clonedTask)->autoCheck()->exec();
$clonedTaskID = $this->dao->lastInsertID();
@@ -641,14 +641,14 @@ class taskModel extends model
$tasks = $this->dao->select('estStarted, realStarted, deadline')->from(TABLE_TASK)->where('parent')->eq($taskID)->andWhere('status')->ne('cancel')->andWhere('deleted')->eq(0)->fetchAll();
if(empty($tasks)) return true;
$earliestEstStarted = '';
$earliestRealStarted = '';
$latestDeadline = '';
foreach($tasks as $task)
{
$estStarted = formatTime($task->estStarted);
$realStarted = formatTime($task->realStarted);
$deadline = formatTime($task->deadline);
if(!isset($earliestEstStarted) or (!empty($estStarted) and $earliestEstStarted > $estStarted)) $earliestEstStarted = $estStarted;
if(!isset($earliestRealStarted) or (!empty($realStarted) and $earliestRealStarted > $realStarted)) $earliestRealStarted = $realStarted;
if(!isset($latestDeadline) or (!empty($deadline) and $latestDeadline < $deadline)) $latestDeadline = $deadline;
if(!helper::isZeroDate($task->estStarted) and (empty($earliestEstStarted) or $earliestEstStarted > $task->estStarted)) $earliestEstStarted = $task->estStarted;
if(!helper::isZeroDate($task->realStarted) and (empty($earliestRealStarted) or $earliestRealStarted > $task->realStarted)) $earliestRealStarted = $task->realStarted;
if(!helper::isZeroDate($task->deadline) and (empty($latestDeadline) or $latestDeadline < $task->deadline)) $latestDeadline = $task->deadline;
}
$newTask = new stdClass();