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

* adjust for computeHours4Multiple when update task.

Browse Source
This commit is contained in:
wangyidong
2019-09-25 08:51:01 +08:00
parent 09c04815ea
commit 8dfe360c5c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+5 -2
View File
@@ -547,10 +547,11 @@ class taskModel extends model
*
* @param object $oldTask
* @param object $task
* @param bool $autoStatus
* @access public
* @return object|bool
*/
public function computeHours4Multiple($oldTask, $task = null, $team = array())
public function computeHours4Multiple($oldTask, $task = null, $team = array(), $autoStatus = true)
{
if(!$oldTask) return false;
@@ -603,6 +604,8 @@ class taskModel extends model
if(!empty($task))
{
if(!$autoStatus) return $currentTask;
if($currentTask->consumed == 0)
{
if(!isset($task->status)) $currentTask->status = 'wait';
@@ -747,7 +750,7 @@ class taskModel extends model
if(!empty($teams))
{
foreach($teams as $member) $this->dao->insert(TABLE_TEAM)->data($member)->autoCheck()->exec();
$task = $this->computeHours4Multiple($oldTask, $task);
$task = $this->computeHours4Multiple($oldTask, $task, array(), $autoStatus = false);
if($task->status == 'wait')
{
reset($teams);