Merge branch ztflow-caoyanyi-feature/task-report#caoyanyi of zentao/zentaopms (#9198)

This commit is contained in:
刘刚
2025-06-06 14:54:12 +08:00
committed by Gitfox
2 changed files with 2 additions and 2 deletions
@@ -29,7 +29,7 @@ class consume_of_frombug_task_in_execution extends baseCalc
public function calculate($row)
{
if($row->isParent == '1') return;
if($row->parent == '0' && $row->fromBug == 0) return;
if($row->fromBug == 0) return;
if(!isset($this->result[$row->execution])) $this->result[$row->execution] = 0;
$this->result[$row->execution] += $row->consumed;
@@ -28,7 +28,7 @@ class count_of_frombug_task_in_execution extends baseCalc
public function calculate($row)
{
if($row->parent == '0' && $row->fromBug == 0) return;
if($row->fromBug == 0) return;
if(!isset($this->result[$row->execution])) $this->result[$row->execution] = 0;
$this->result[$row->execution] ++;