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

Merge branch '12.x'

Browse Source
This commit is contained in:
wangyidong
2020-12-11 20:42:10 +08:00
parent a18ac6792e 5dbd8270bb
commit c771e1947c
89 changed files with 1780 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+12 -5
View File
@@ -1127,7 +1127,7 @@ class taskModel extends model
$task->left = 0;
if(!$task->finishedBy) $task->finishedBy = $this->app->user->account;
if($task->closedReason) $task->closedDate = $now;
$task->finishedDate = $oldTask->status == 'done' ? $oldTask->finishedDate : $now;
$task->finishedDate = $oldTask->status == 'done' ? $oldTask->finishedDate : $now;
$task->canceledBy = '';
$task->canceledDate = '';
@@ -1136,15 +1136,22 @@ class taskModel extends model
$task->assignedTo = $oldTask->openedBy;
$task->assignedDate = $now;
if(!$task->canceledBy) $task->canceledBy = $this->app->user->account;
if(!$task->canceledDate) $task->canceledDate = $now;
if(!$task->canceledBy)
{
$task->canceledBy = $this->app->user->account;
$task->canceledDate = $now;
}
$task->finishedBy = '';
$task->finishedDate = '';
break;
case 'closed':
if(!$task->closedBy) $task->closedBy = $this->app->user->account;
if(!$task->closedDate) $task->closedDate = $now;
if(!$task->closedBy)
{
$task->closedBy = $this->app->user->account;
$task->closedDate = $now;
}
if($task->closedReason == 'cancel' and $task->finishedDate == '0000-00-00 00:00:00') $task->finishedDate = '';
break;
case 'wait':
if($task->consumed > 0 and $task->left > 0) $task->status = 'doing';