From 9fe6c4b5fe1014c3a7c1ab6efc8423ed7ae6df83 Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Tue, 1 Aug 2023 06:02:42 +0000
Subject: [PATCH] * Finish task#99185.

---
 .../global/scale/count_of_invalid_story.php   |  2 +-
 ... => count_of_invalid_story_in_project.php} | 19 ++++++++-------
 .../hour/consume_of_task_in_execution.php     |  0
 .../hour/estimate_of_task_in_execution.php    |  0
 .../hour/left_of_task_in_execution.php        |  0
 .../scale/count_of_task_in_execution.php      |  0
 .../count_of_invalid_story_in_project.php     | 24 +++++++++++++++++++
 7 files changed, 35 insertions(+), 10 deletions(-)
 rename module/metric/calc/project/scale/{count_of_invalid_story_in_project.php.tmp => count_of_invalid_story_in_project.php} (73%)
 mode change 100644 => 100755 module/metric/test/calc/execution/hour/consume_of_task_in_execution.php
 mode change 100644 => 100755 module/metric/test/calc/execution/hour/estimate_of_task_in_execution.php
 mode change 100644 => 100755 module/metric/test/calc/execution/hour/left_of_task_in_execution.php
 mode change 100644 => 100755 module/metric/test/calc/execution/scale/count_of_task_in_execution.php
 create mode 100755 module/metric/test/calc/project/scale/count_of_invalid_story_in_project.php

diff --git a/module/metric/calc/global/scale/count_of_invalid_story.php b/module/metric/calc/global/scale/count_of_invalid_story.php
index c343f26e36..450e9d61f7 100644
--- a/module/metric/calc/global/scale/count_of_invalid_story.php
+++ b/module/metric/calc/global/scale/count_of_invalid_story.php
@@ -35,7 +35,7 @@ class count_of_invalid_story extends baseCalc
             ->andWhere('t2.deleted')->eq(0)
             ->andWhere('t1.type')->eq('story')
             ->andWhere('t2.shadow')->eq(0)
-            ->andWhere('t1.closedReason')->in('duplicate,willnotdo,bydesign,cancel')
+            ->andWhere('t1.closedReason')->in('duplicate,willnotdo,bydesign')
             ->query();
     }
 
diff --git a/module/metric/calc/project/scale/count_of_invalid_story_in_project.php.tmp b/module/metric/calc/project/scale/count_of_invalid_story_in_project.php
similarity index 73%
rename from module/metric/calc/project/scale/count_of_invalid_story_in_project.php.tmp
rename to module/metric/calc/project/scale/count_of_invalid_story_in_project.php
index 59a9d04736..4800d94013 100644
--- a/module/metric/calc/project/scale/count_of_invalid_story_in_project.php.tmp
+++ b/module/metric/calc/project/scale/count_of_invalid_story_in_project.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * 按项目统计的无效研发需求数。
- * count_of_invalid_story_in_project.
+ * Count of invalid story in project.
  *
  * 范围：project
  * 对象：story
@@ -9,7 +9,7 @@
  * 度量名称：按项目统计的无效研发需求数
  * 单位：个
  * 描述：按项目统计的无效研发需求数是指被判定为无效的研发需求数量。无效需求可能包括重复需求、不可实现的需求、或者与项目策略和目标不符的需求。通过对无效需求的统计，可以帮助项目团队优化需求管理和筛选机制，以提高需求有效性和资源利用率。较高的无效需求数量可能需要对需求收集和评估流程进行改进。
- * 定义：项目中研发需求的个数求和;关闭原因为重复、不做、设计如此;过滤已删除的研发需求;过滤已删除的项目
+ * 定义：项目中研发需求的个数求和;关闭原因为重复、不做、设计如此;过滤已删除的研发需求;过滤已删除的项目;
  * 度量库：
  * 收集方式：realtime
  *
@@ -22,21 +22,22 @@
  */
 class count_of_invalid_story_in_project extends baseCalc
 {
-    public $dataset = null;
+    public $dataset = 'getDevStoriesWithProject';
 
-    public $fieldList = array();
+    public $fieldList = array('t3.project', 't1.closedReason');
 
-    //public funtion getStatement($dao)
-    //{
-    //}
+    public $result = array();
 
     public function calculate($row)
     {
+        $project = $row->project;
+        if(!isset($this->result[$project])) $this->result[$project] = 0;
+        if(in_array($row->closedReason, array('duplicate','willnotdo','budesign'))) $this->result[$project] += 1;
     }
 
     public function getResult($options = array())
     {
-        $records = $this->getRecords(array('value'));
+        $records = $this->getRecords(array('project', 'value'));
         return $this->filterByOptions($records, $options);
     }
-}
\ No newline at end of file
+}
diff --git a/module/metric/test/calc/execution/hour/consume_of_task_in_execution.php b/module/metric/test/calc/execution/hour/consume_of_task_in_execution.php
old mode 100644
new mode 100755
diff --git a/module/metric/test/calc/execution/hour/estimate_of_task_in_execution.php b/module/metric/test/calc/execution/hour/estimate_of_task_in_execution.php
old mode 100644
new mode 100755
diff --git a/module/metric/test/calc/execution/hour/left_of_task_in_execution.php b/module/metric/test/calc/execution/hour/left_of_task_in_execution.php
old mode 100644
new mode 100755
diff --git a/module/metric/test/calc/execution/scale/count_of_task_in_execution.php b/module/metric/test/calc/execution/scale/count_of_task_in_execution.php
old mode 100644
new mode 100755
diff --git a/module/metric/test/calc/project/scale/count_of_invalid_story_in_project.php b/module/metric/test/calc/project/scale/count_of_invalid_story_in_project.php
new file mode 100755
index 0000000000..fbdad7edbc
--- /dev/null
+++ b/module/metric/test/calc/project/scale/count_of_invalid_story_in_project.php
@@ -0,0 +1,24 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 7) . '/test/lib/init.php';
+include dirname(__FILE__, 4) . '/calc.class.php';
+
+zdTable('product')->config('product', $useCommon = true, $levels = 4)->gen(10);
+zdTable('project')->config('project_close', $useCommon = true, $levels = 4)->gen(10);
+zdTable('story')->config('story_status_closedreason', $useCommon = true, $levels = 4)->gen(1000);
+zdTable('projectstory')->config('projectstory', $useCommon = true, $levels = 4)->gen(1000);
+
+$metric = new metricTest();
+$calc   = $metric->calcMetric(__FILE__);
+
+/**
+
+title=count_of_invalid_story_in_project
+cid=1
+pid=1
+
+*/
+
+r(count($calc->getResult())) && p('') && e('6'); // 测试分组数。
+
+r($calc->getResult(array('project' => '4'))) && p('0:value') && e('7');  // 测试。