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

* fix for finish task.

Browse Source
This commit is contained in:
wangyidong
2022-08-25 16:14:22 +08:00
parent 00c7f7520d
commit 4a50ba5737
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+1 -10
View File
@@ -1964,16 +1964,7 @@ class taskModel extends model
if(!empty($oldTask->team) and $currentTeam)
{
$this->dao->update(TABLE_TASKTEAM)
->set('left')->eq(0)
->set('consumed')->eq($task->consumed)
->set('status')->eq('done')
->where('task')->eq((int)$taskID)
->andWhere('account')->eq($this->app->user->account)->exec();
$skipMembers = $oldTask->mode == 'linear' ? $this->loadModel('execution')->getTeamSkip($oldTask->team, $oldTask->assignedTo, $task->assignedTo) : $this->getFinishedUsers($oldTask->id, array_keys($oldTask->team));
foreach($skipMembers as $account => $team) $this->dao->update(TABLE_TASKTEAM)->set('left')->eq(0)->where('task')->eq($taskID)->andWhere('account')->eq($account)->exec();
$this->dao->update(TABLE_TASKTEAM)->set('left')->eq(0)->set('consumed')->eq($task->consumed)->set('status')->eq('done')->where('id')->eq($currentTeam->id)->exec();
$task = $this->computeHours4Multiple($oldTask, $task);
$finishedUsers = $this->getFinishedUsers($oldTask->id, array_keys($oldTask->members));