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

Merge branch 'sprint/hufangzhou_feedback_1304' into 'master'

Browse Source 
* Handle feedback #1304.

See merge request easycorp/zentaopms!5957
This commit is contained in:
王怡栋
2022-11-01 05:32:32 +00:00
parent b7247e2652 402d4a6333
commit afd87a2364
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+10 -2
View File
@@ -3014,8 +3014,16 @@ class taskModel extends model
$data->status = ($left == 0 && $consumed != 0) ? 'done' : $task->status;
if($estimate->isLast and $consumed == 0 and $task->status != 'wait')
{
$data->status = 'wait';
$data->left = $task->estimate;
$data->status = 'wait';
$data->left = $task->estimate;
$data->finishedBy = '';
$data->canceledBy = '';
$data->closedBy = '';
$data->closedReason = '';
$data->finishedDate = '0000-00-00 00:00:00';
$data->canceledDate = '0000-00-00 00:00:00';
$data->closedDate = '0000-00-00 00:00:00';
if($task->assignedTo == 'closed') $data->assignedTo = $this->app->user->account;
}
elseif($consumed != 0 and $left == 0 and strpos('done,pause,cancel,closed', $task->status) === false)
{