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

* Fix bug #44853.

Browse Source
This commit is contained in:
tianshujie
2024-01-23 16:36:15 +08:00
parent dace9eef47
commit 827befa797
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+5 -4
View File
@@ -2261,9 +2261,9 @@ class taskModel extends model
$member->task = $task->id;
$member->order = $index;
$member->account = $account;
$member->estimate = zget($teamData->teamEstimate, $index, 0);
$member->consumed = isset($teamData->teamConsumed) ? zget($teamData->teamConsumed, $index, 0) : 0;
$member->left = isset($teamData->teamLeft) ? zget($teamData->teamLeft, $index, 0) : 0;
$member->estimate = isset($teamData->teamEstimate) ? (float)zget($teamData->teamEstimate, $index, 0.00) : 0.00;
$member->consumed = isset($teamData->teamConsumed) ? (float)zget($teamData->teamConsumed, $index, 0.00) : 0.00;
$member->left = isset($teamData->teamLeft) ? (float)zget($teamData->teamLeft, $index, 0.00) : 0.00;
$member->status = 'wait';
if($task->status == 'wait' && $member->estimate > 0 && $member->left == 0) $member->left = $member->estimate;
if($task->status == 'done') $member->left = 0;
@@ -3141,7 +3141,8 @@ class taskModel extends model
->where('id')->eq($taskID)
->exec();
if(!dao::isError()) return common::createChanges($oldTask, $task);
if(dao::isError()) return false;
return common::createChanges($oldTask, $task);
}
/**