Merge branch 'sprint/scx_gfl_something' into 'master'

* Fix bug for story finished percent. See merge request easycorp/zentaopms!6632
2022-12-26 08:49:13 +00:00
parent d66a961b00 c211acfadc
commit b520d3333e
1 changed files with 6 additions and 2 deletions
@@ -1871,13 +1871,17 @@ class productModel extends model
        $finishClosedStory = $this->dao->select('product, count(1) as finish')->from(TABLE_STORY)
            ->where('deleted')->eq(0)
            ->andWhere('status')->eq('closed')
+            ->andWhere('type')->eq('story')
            ->andWhere('closedReason')->eq('done')
-            ->fetchPairs('product', 'finish');
+            ->groupBy('product')
+            ->fetchPairs();

        $unclosedStory = $this->dao->select('product, count(1) as unclosed')->from(TABLE_STORY)
            ->where('deleted')->eq(0)
+            ->andWhere('type')->eq('story')
            ->andWhere('status')->ne('closed')
-            ->fetchPairs('product', 'unclosed');
+            ->groupBy('product')
+            ->fetchPairs();

        $plans = $this->dao->select('product, count(*) AS count')
            ->from(TABLE_PRODUCTPLAN)