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

* Finish task #59646.

Browse Source
This commit is contained in:
daitingting
2022-07-05 09:20:47 +00:00
parent 667b4fcd1a
commit be44e76cb9
4 changed files with 126 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/model.php
+32 -4
View File
@@ -303,6 +303,7 @@ class todoModel extends model
{
$this->file->updateObjectID($this->post->uid, $todoID, 'todo');
if(!empty($oldTodo->cycle)) $this->createByCycle(array($todoID => $todo));
if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $todo->type == 'feedback' && $todo->idvalue) $this->loadModel('feedback')->updateStatus('todo', $todo->idvalue, $todo->status);
return common::createChanges($oldTodo, $todo);
}
}
@@ -367,6 +368,12 @@ class todoModel extends model
if(!dao::isError())
{
if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $todo->type == 'feedback' && $todo->idvalue && !isset($feedbacks[$todo->idvalue]))
{
$feedbacks[$todo->idvalue] = $todo->idvalue;
$this->loadModel('feedback')->updateStatus('todo', $todo->idvalue, $todo->status);
}
$allChanges[$todoID] = common::createChanges($oldTodo, $todo);
}
else
@@ -409,8 +416,18 @@ class todoModel extends model
->set('finishedDate')->eq(helper::now())
->where('id')->eq((int)$todoID)
->exec();
$this->loadModel('action')->create('todo', $todoID, 'finished', '', 'done');
return;
if(!dao::isError())
{
$this->loadModel('action')->create('todo', $todoID, 'finished', '', 'done');
if(($this->config->edition == 'biz' || $this->config->edition == 'max'))
{
$feedbackID = $this->dao->select('idvalue')->from(TABLE_TODO)->where('id')->eq($todoID)->andWhere('type')->eq('feedback')->fetch('idvalue');
if($feedbackID) $this->loadModel('feedback')->updateStatus('todo', $feedbackID, 'done');
}
return true;
}
return false;
}
/**
@@ -767,8 +784,19 @@ class todoModel extends model
->set('assignedDate')->eq($now)
->where('id')->eq((int)$todoID)
->exec();
$this->loadModel('action')->create('todo', $todoID, 'closed', '', 'closed');
return !dao::isError();
if(!dao::isError())
{
$this->loadModel('action')->create('todo', $todoID, 'closed', '', 'closed');
if(($this->config->edition == 'biz' || $this->config->edition == 'max'))
{
$feedbackID = $this->dao->select('idvalue')->from(TABLE_TODO)->where('id')->eq($todoID)->andWhere('type')->eq('feedback')->fetch('idvalue');
if($feedbackID) $this->loadModel('feedback')->updateStatus('todo', $feedbackID, 'closed');
}
return true;
}
return false;
}
/**