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

* adjust for finish.

Browse Source
This commit is contained in:
wangyidong
2022-08-25 13:25:58 +08:00
parent 232c669a4e
commit d9b1aa5e8d
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
-14
View File
@@ -1339,20 +1339,6 @@ class task extends control
$task->myConsumed = 0; $task->myConsumed = 0;
$currentTeam = $this->task->getTeamByAccount($task->team); $currentTeam = $this->task->getTeamByAccount($task->team);
if($currentTeam) $task->myConsumed = $currentTeam->consumed; if($currentTeam) $task->myConsumed = $currentTeam->consumed;
$task->nextBy = $this->task->getAssignedTo4Multi($members, $task);
$task->myConsumed = isset($task->team[$this->app->user->account]) ? $task->team[$this->app->user->account]->consumed : 0;
$lastAccount = end($teams);
$finishedUsers = $this->task->getFinishedUsers($taskID, $teams);
if(($lastAccount != $task->assignedTo and $task->mode == 'linear') or ($task->mode == 'multi' and count($teams) != count($finishedUsers)))
{
$members = $this->task->getMemberPairs($task);
}
else
{
$task->nextBy = $task->openedBy;
}
} }
$this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->finish; $this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->finish;