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

Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'

Browse Source 
# Conflicts:
#   module/task/model.php
This commit is contained in:
孙广明
2022-02-25 00:41:58 +00:00
parent d605fd3f2d bb7a5fc073
commit 25f71e0a51
119 changed files with 295 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+2 -2
View File
@@ -2555,7 +2555,7 @@ class taskModel extends model
$lastEstimate = $this->dao->select('*')->from(TABLE_TASKESTIMATE)->where('task')->eq($estimate->task)->orderBy('date desc,id desc')->limit(1)->fetch();
$consumed = $task->consumed - $estimate->consumed;
$left = $lastEstimate->left ? $lastEstimate->left : $estimate->left;
$left = isset($lastEstimate->left) ? $lastEstimate->left : $estimate->left;
$data = new stdclass();
$data->consumed = $consumed;
@@ -2580,7 +2580,7 @@ class taskModel extends model
$this->dao->update(TABLE_TASK)->data($data) ->where('id')->eq($estimate->task)->exec();
if($task->parent > 0) $this->updateParentStatus($task->id);
if($task->story) $this->loadModel('story')->setStage($oldTask->story);
if($task->story) $this->loadModel('story')->setStage($task->story);
$oldTask = new stdClass();
$oldTask->consumed = $task->consumed;