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

* finish task #7075.

Browse Source
This commit is contained in:
wangyidong
2020-04-28 16:31:18 +08:00
parent 1c29b742a0
commit 2372831886
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+21 -8
View File
@@ -1089,11 +1089,13 @@ class taskModel extends model
if(!empty($oldTask->team))
{
$this->dao->update(TABLE_TEAM)->set('left')->eq(0)
->where('root')->eq($taskID)
->andWhere('type')->eq('task')
->andWhere('account')->eq($oldTask->assignedTo)
->exec();
$beginTag = false;
foreach($oldTask->team as $account => $team)
{
if($account == $task->assignedTo) break;
if($account == $oldTask->assignedTo) $beginTag = true;
if($beginTag) $this->dao->update(TABLE_TEAM)->set('left')->eq(0)->where('root')->eq($taskID)->andWhere('type')->eq('task')->andWhere('account')->eq($account)->exec();
}
$this->dao->update(TABLE_TEAM)->set('left')->eq($task->left)
->where('root')->eq($taskID)
@@ -1399,13 +1401,24 @@ class taskModel extends model
if(!empty($oldTask->team))
{
$this->dao->update(TABLE_TEAM)
->set('left')->eq(0)
->set('consumed')->eq($task->consumed)
$this->dao->update(TABLE_TEAM)->set('left')->eq(0)->set('consumed')->eq($task->consumed)
->where('root')->eq((int)$taskID)
->andWhere('type')->eq('task')
->andWhere('account')->eq($oldTask->assignedTo)->exec();
$beginTag = false;
foreach($oldTask->team as $account => $team)
{
if($account == $task->assignedTo) break;
if($account == $oldTask->assignedTo)
{
$beginTag = true;
continue;
}
if($beginTag) $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);
}