From 3bd12c0d3afb168043b56d46576ad91092355648 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 18 Oct 2023 14:00:53 +0800 Subject: [PATCH] * Update project's consumed and left hours without deleted execution. --- module/program/model.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/module/program/model.php b/module/program/model.php index 885f9d859d..23a351c494 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1351,7 +1351,6 @@ class programModel extends model $summary[$task->execution]->totalLeft += ($task->status == 'closed' or $task->status == 'cancel') ? 0 : $task->left; } - $teamMembers = $this->dao->select('t1.root, COUNT(1) AS members')->from(TABLE_TEAM)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account=t2.account') ->where('t1.type')->eq('project') @@ -1418,8 +1417,8 @@ class programModel extends model ->set('progress')->eq($progress) ->set('teamCount')->eq($project['teamCount']) ->set('estimate')->eq($project['totalEstimate']) - ->set('consumed')->eq($project['totalConsumed']) - ->set('left')->eq($project['totalLeft']) + ->set('consumed')->eq($project['totalConsumedNotDel']) + ->set('left')->eq($project['totalLeftNotDel']) ->where('id')->eq($projectID) ->exec(); }