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

Merge branch 'sprint/211_sunjun_60474' into 'master'

Browse Source 
Sprint/211 sunjun 60474

See merge request easycorp/zentaopms!4503
This commit is contained in:
孙广明
2022-07-13 05:10:46 +00:00
parent ec135f3c40 0c7767c3c5
commit d8e313669e
12 changed files with 131 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+16 -3
View File
@@ -719,7 +719,6 @@ class taskModel extends model
$task->assignedTo = $childTask->assignedTo;
$task->assignedDate = $now;
}
$task->finishedBy = '';
$task->finishedDate = '';
$task->closedBy = '';
@@ -749,6 +748,7 @@ class taskModel extends model
if($status == 'doing' and $parentTask->status == 'wait') $action = 'Started';
if($status == 'doing' and $parentTask->status == 'pause') $action = 'Restarted';
if($status == 'doing' and $parentTask->status != 'wait' and $parentTask->status != 'pause') $action = 'Activated';
if($status == 'wait' and $parentTask->status != 'wait') $action = 'Adjusttasktowait';
if($action)
{
$actionID = $this->loadModel('action')->create('task', $parentID, $action, '', '', '', false);
@@ -833,7 +833,8 @@ class taskModel extends model
$currentTask->consumed += (float)$member->consumed;
$currentTask->left += (float)$member->left;
}
if(empty($oldTask->team) and isset($oldTask->consumed)) $currentTask->consumed += (float)$oldTask->consumed;
if($this->app->rawMethod == 'edit' and empty($oldTask->team) and isset($oldTask->consumed)) $currentTask->consumed += (float)$oldTask->consumed;
if(!empty($task))
{
@@ -2834,7 +2835,19 @@ class taskModel extends model
$data->consumed = $consumed;
$data->left = $left;
$data->status = ($left == 0 && $consumed != 0) ? 'done' : $task->status;
if($left == 0 and $consumed != 0)
{
$data->status = 'done';
}
elseif($consumed == 0)
{
$data->status = 'wait';
$data->left = $task->left + $estimate->consumed;
}
else
{
$data->status = $task->status;
}
if(!empty($task->team))
{
$oldConsumed = $task->team[$estimate->account]->consumed;