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

* Fix bug #22979.

Browse Source
This commit is contained in:
tianshujie
2022-05-26 21:08:37 +08:00
parent a0af734e79
commit 53e95069e4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+7 -1
View File
@@ -842,7 +842,7 @@ class taskModel extends model
if($currentTask->consumed > 0 and $currentTask->left == 0)
{
$finisedUsers = $this->getFinishedUsers($oldTask->id, $teams);
if(($oldTask->mode == 'linear' and isset($team[$currentTask->assignedTo]) and $oldTask->assignedTo != $teams[count($teams) - 1]) or ($oldTask->mode == 'multi' and count($finisedUsers) != (count($teams) -1)))
if(($oldTask->mode == 'linear' and isset($team[$currentTask->assignedTo]) and $oldTask->assignedTo != $teams[count($teams) - 1]) or ($oldTask->mode == 'multi' and count($finisedUsers) != count($teams)))
{
$currentTask->status = 'doing';
$currentTask->finishedBy = '';
@@ -1841,6 +1841,12 @@ class taskModel extends model
foreach($skipMembers as $account => $team) $this->dao->update(TABLE_TEAM)->set('left')->eq(0)->where('root')->eq($taskID)->andWhere('type')->eq('task')->andWhere('account')->eq($account)->exec();
$task = $this->computeHours4Multiple($oldTask, $task);
if($oldTask->mode == 'multi' and count($skipMembers) == (count($oldTask->team) - 1))
{
$task->status = 'done';
$task->finishedBy = $this->app->user->account;
$task->finishedDate = $task->finishedDate;
}
}
if($task->finishedDate == substr($now, 0, 10)) $task->finishedDate = $now;