* Fix the bug that system metric didn't count shadow products.

2024-01-25 15:58:33 +08:00
parent 11ed2125e3
commit cbfbc85fa8
57 changed files with 138 additions and 59 deletions
@@ -20,7 +20,7 @@
 */
 class rate_of_annual_delivered_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.stage', 't1.releasedDate', 't1.closedReason', 't1.closedDate');

@@ -20,7 +20,7 @@
 */
 class rate_of_annual_finished_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.closedDate', 't1.closedReason');

@@ -20,7 +20,7 @@
 */
 class rate_of_delivered_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.closedReason', 't1.stage');

@@ -20,7 +20,7 @@
 */
 class rate_of_finished_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.status', 't1.closedReason');

@@ -20,7 +20,7 @@
 */
 class rate_of_fixed_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.status', 't1.resolution');

@@ -20,7 +20,7 @@
 */
 class count_of_activated_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.status');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_closed_feedback extends baseCalc
 {
-    public $dataset = 'getFeedbacks';
+    public $dataset = 'getAllFeedbacks';

    public $fieldList = array('t1.status', 't1.closedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_closed_productplan extends baseCalc
 {
-    public $dataset = 'getPlans';
+    public $dataset = 'getAllPlans';

    public $fieldList = array('t1.closedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_created_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.openedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_created_case extends baseCalc
 {
-    public $dataset = 'getCases';
+    public $dataset = 'getAllCases';

    public $fieldList = array('t1.openedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_created_feedback extends baseCalc
 {
-    public $dataset = 'getFeedbacks';
+    public $dataset = 'getAllFeedbacks';

    public $fieldList = array('openedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_created_productplan extends baseCalc
 {
-    public $dataset = 'getPlans';
+    public $dataset = 'getAllPlans';

    public $fieldList = array('t1.createdDate');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_created_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.openedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_delivered_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.stage', 't1.releasedDate', 't1.closedReason', 't1.closedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_finished_productplan extends baseCalc
 {
-    public $dataset = 'getPlans';
+    public $dataset = 'getAllPlans';

    public $fieldList = array('t1.finishedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_finished_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.closedDate', 't1.closedReason');

@@ -20,7 +20,7 @@
 */
 class count_of_annual_fixed_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.closedDate', 't1.status', 't1.resolution');

@@ -20,7 +20,7 @@
 */
 class count_of_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.id');

@@ -20,7 +20,7 @@
 */
 class count_of_case extends baseCalc
 {
-    public $dataset = 'getCases';
+    public $dataset = 'getAllCases';

    public $fieldList = array('t1.id');

@@ -20,7 +20,7 @@
 */
 class count_of_closed_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.status');

@@ -20,7 +20,7 @@
 */
 class count_of_closed_feedback extends baseCalc
 {
-    public $dataset = 'getFeedbacks';
+    public $dataset = 'getAllFeedbacks';

    public $fieldList = array('t1.status');

@@ -20,7 +20,7 @@
 */
 class count_of_closed_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.status');

@@ -20,7 +20,7 @@
 */
 class count_of_daily_closed_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.closedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_daily_created_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.openedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_delivered_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.stage', 't1.closedReason');

@@ -20,7 +20,7 @@
 */
 class count_of_feedback extends baseCalc
 {
-    public $dataset = 'getFeedbacks';
+    public $dataset = 'getAllFeedbacks';

    public $fieldList = array('t1.id');

@@ -20,7 +20,7 @@
 */
 class count_of_finished_productplan extends baseCalc
 {
-    public $dataset = 'getPlans';
+    public $dataset = 'getAllPlans';

    public $fieldList = array('t1.status', 't1.closedReason');

@@ -20,7 +20,7 @@
 */
 class count_of_finished_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.stage', 't1.closedReason');

@@ -20,7 +20,7 @@
 */
 class count_of_fixed_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.status', 't1.resolution');

@@ -29,7 +29,6 @@ class count_of_invalid_story extends baseCalc
            ->where('t1.deleted')->eq(0)
            ->andWhere('t2.deleted')->eq(0)
            ->andWhere('t1.type')->eq('story')
-            ->andWhere('t2.shadow')->eq(0)
            ->andWhere('t1.closedReason')->in('duplicate,willnotdo,bydesign')
            ->andWhere("t1.vision NOT LIKE '%or%'")
            ->andWhere("t1.vision NOT LIKE '%lite%'")
@@ -20,7 +20,7 @@
 */
 class count_of_monthly_created_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.openedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_monthly_created_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.openedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_monthly_finished_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.closedDate', 't1.closedReason');

@@ -20,7 +20,7 @@
 */
 class count_of_monthly_fixed_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.closedDate', 't1.status', 't1.resolution');

@@ -20,7 +20,7 @@
 */
 class count_of_productplan extends baseCalc
 {
-    public $dataset = 'getPlans';
+    public $dataset = 'getAllPlans';

    public $fieldList = array('t1.id');

@@ -20,7 +20,7 @@
 */
 class count_of_resolved_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.status');

@@ -20,7 +20,7 @@
 */
 class count_of_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.id');

@@ -20,7 +20,7 @@
 */
 class count_of_unclosed_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.status');

@@ -20,7 +20,7 @@
 */
 class count_of_unclosed_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.stage');

@@ -20,7 +20,7 @@
 */
 class count_of_unfinished_productplan extends baseCalc
 {
-    public $dataset = 'getPlans';
+    public $dataset = 'getAllPlans';

    public $fieldList = array('t1.status', 't1.closedReason');

@@ -20,7 +20,7 @@
 */
 class count_of_valid_bug extends baseCalc
 {
-    public $dataset = 'getBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.status', 't1.resolution');

@@ -28,7 +28,6 @@ class count_of_valid_story extends baseCalc
            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
            ->where('t1.deleted')->eq(0)
            ->andWhere('t2.deleted')->eq(0)
-            ->andWhere('t2.shadow')->eq(0)
            ->andWhere('t1.type')->eq('story')
            ->andWhere('t1.closedReason')->notin('duplicate,willnotdo,bydesign,cancel')
            ->andWhere("t1.vision NOT LIKE '%or%'")
@@ -20,7 +20,7 @@
 */
 class scale_of_annual_closed_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.estimate', 't1.status', 't1.closedDate', 't1.parent');

@@ -20,7 +20,7 @@
 */
 class scale_of_annual_delivered_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.stage', 't1.releasedDate', 't1.closedReason', 't1.closedDate', 't1.estimate', 't1.parent');

@@ -20,7 +20,7 @@
 */
 class scale_of_annual_finished_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.estimate', 't1.status', 't1.closedDate', 't1.closedReason', 't1.parent');

@@ -20,7 +20,7 @@
 */
 class scale_of_invalid_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.estimate', 't1.closedReason', 't1.parent');

@@ -20,7 +20,7 @@
 */
 class scale_of_monthly_closed_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.status', 't1.closedDate', 't1.estimate', 't1.parent');

@@ -20,7 +20,7 @@
 */
 class scale_of_monthly_delivered_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.stage', 't1.releasedDate', 't1.closedReason', 't1.closedDate', 't1.estimate', 't1.parent');

@@ -20,7 +20,7 @@
 */
 class scale_of_monthly_finished_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.closedDate', 't1.closedReason', 't1.estimate', 't1.parent');

@@ -20,7 +20,7 @@
 */
 class scale_of_valid_story extends baseCalc
 {
-    public $dataset = 'getDevStories';
+    public $dataset = 'getAllDevStories';

    public $fieldList = array('t1.estimate', 't1.closedReason', 't1.parent');

@@ -20,7 +20,7 @@
 */
 class count_of_assigned_bug_in_user extends baseCalc
 {
-    public $dataset = 'getBugsWithShadowProduct';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.assignedTo');

@@ -20,7 +20,7 @@
 */
 class count_of_assigned_feedback_in_user extends baseCalc
 {
-    public $dataset = 'getFeedbacks';
+    public $dataset = 'getAllFeedbacks';

    public $fieldList = array('t1.assignedTo');

@@ -20,7 +20,7 @@
 */
 class count_of_daily_fixed_bug_in_user extends baseCalc
 {
-    public $dataset = 'getProjectBugs';
+    public $dataset = 'getAllBugs';

    public $fieldList = array('t1.resolvedBy', 't1.resolvedDate');

@@ -20,7 +20,7 @@
 */
 class count_of_daily_review_feedback_in_user extends baseCalc
 {
-    public $dataset = 'getFeedbacks';
+    public $dataset = 'getAllFeedbacks';

    public $fieldList = array('t1.reviewedBy', 't1.reviewedDate');

@@ -38,7 +38,6 @@ class count_of_delayed_bug_in_user extends baseCalc
            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
            ->where('t1.deleted')->eq(0)
            ->andWhere('t2.deleted')->eq(0)
-            ->andWhere('t2.shadow')->eq(0)
            ->andWhere('t1.status')->eq('active')
            ->andWhere('t1.assignedDate')->notZeroDatetime()
            ->andWhere('DATEDIFF(CURDATE(), assignedDate)')->gt($longlife)
@@ -20,7 +20,7 @@
 */
 class count_of_reviewing_feedback_in_user extends baseCalc
 {
-    public $dataset = 'getFeedbacks';
+    public $dataset = 'getAllFeedbacks';

    public $fieldList = array('t1.status', 't1.assignedTo');

@@ -144,9 +144,21 @@ class dataset
            ->query();
    }

+    /*
+    public function getAllReleases($fieldList)
+    {
+        return $this->dao->select($fieldList)
+            ->from(TABLE_RELEASE)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->where('t1.deleted')->eq(0)
+            ->andWhere('t2.deleted')->eq(0)
+            ->query();
+    }
+    */
+
    /**
     * 获取产品计划数据。
-     * Get plan list.
+     * Get plan list, without shadow product's data.
     *
     * @param  string       $fieldList
     * @access public
@@ -163,9 +175,27 @@ class dataset
            ->query();
    }

+    /**
+     * 获取产品计划数据，包括项目型项目的计划。
+     * Get plan list include shadow product data.
+     *
+     * @param  string       $fieldList
+     * @access public
+     * @return PDOStatement
+     */
+    public function getAllPlans($fieldList)
+    {
+        return $this->dao->select($fieldList)
+            ->from(TABLE_PRODUCTPLAN)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->where('t1.deleted')->eq(0)
+            ->andWhere('t2.deleted')->eq(0)
+            ->query();
+    }
+
    /**
     * 获取bug数据。
-     * Get bug list.
+     * Get product bug list.
     *
     * @param  string       $fieldList
     * @access public
@@ -182,7 +212,15 @@ class dataset
            ->query();
    }

-    public function getBugsWithShadowProduct($fieldList)
+    /**
+     * 获取所有bug数据。
+     * Get all bug list.
+     *
+     * @param  string       $fieldList
+     * @access public
+     * @return PDOStatement
+     */
+    public function getAllBugs($fieldList)
    {
        return $this->dao->select($fieldList)
            ->from(TABLE_BUG)->alias('t1')
@@ -231,6 +269,23 @@ class dataset
            ->query();
    }

+    /**
+     * 获取所有反馈数据。
+     * Get all feedback list.
+     *
+     * @param  string       $fieldList
+     * @access public
+     * @return PDOStatement
+     */
+    public function getAllFeedbacks($fieldList)
+    {
+        return $this->dao->select($fieldList)->from(TABLE_FEEDBACK)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->where('t1.deleted')->eq(0)
+            ->andWhere('t2.deleted')->eq(0)
+            ->query();
+    }
+
    /**
     * 获取需求数据。
     * Get story list.
@@ -392,6 +447,25 @@ class dataset
            ->query();
    }

+    /**
+     * 获取所有用例数据。
+     * Get all case list.
+     *
+     * @param  string       $fieldList
+     * @access public
+     * @return PDOStatement
+     */
+    public function getAllCases($fieldList)
+    {
+        return $this->dao->select($fieldList)->from(TABLE_CASE)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->where('t1.deleted')->eq(0)
+            ->andWhere('t2.deleted')->eq(0)
+            ->andWhere("t2.vision NOT LIKE '%or%'")
+            ->andWhere("t2.vision NOT LIKE '%lite%'")
+            ->query();
+    }
+
    /**
     * 获取产品数据。
     * Get product list.
@@ -618,6 +692,14 @@ class dataset
            ->query();
    }

+    /**
+     * 统计mr信息。
+     * Get merge request data.
+     *
+     * @param  string       $fieldList
+     * @access public
+     * @return PDOStatement
+     */
    public function getMRs($fieldList)
    {
        return $this->dao->select($fieldList)->from(TABLE_MR)->alias('t1')