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

2025-06-06 17:26:30 +08:00
parent 35e6389276 37d96a41df
commit 44f33563fc
1 changed files with 2 additions and 1 deletions
@@ -31,7 +31,8 @@ class rate_of_hour_process_task extends baseCalc
        if($row->isParent) return;

        $this->result['consumed'] += $row->consumed;
-        $this->result['left']     += $row->left;
+
+        if($row->status != 'closed' && $row->status != 'cancel') $this->result['left'] += $row->left;
    }

    public function getResult($options = array())