From bf9bad8976e1eccbd8fb315cdc2bafb4095f4279 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Sun, 8 Oct 2023 13:36:17 +0800
Subject: [PATCH] * Adjust usage report.

---
 module/screen/model.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/module/screen/model.php b/module/screen/model.php
index 3fe4491fe1..fbde18a23c 100644
--- a/module/screen/model.php
+++ b/module/screen/model.php
@@ -1716,7 +1716,7 @@ class screenModel extends model
 
     /**
      * 获取应用健康度体检报告的活跃账号数项目间对比表格。
-     * Get table of active account per project.
+     * Get table of active account per project in usage report.
      *
      * @param  string $year
      * @param  string $month
@@ -1767,8 +1767,8 @@ class screenModel extends model
     }
 
     /**
-     * 获取活跃项目数卡片。
-     * Get card of active project.
+     * 获取应用健康度体检报告的活跃项目数卡片。
+     * Get card of active project in usage report.
      *
      * @param  string $year
      * @param  string $month
@@ -1785,13 +1785,13 @@ class screenModel extends model
     }
 
     /**
-     * 获取活跃产品数卡片。
-     * Get card of active product.
+     * 获取应用健康度体检报告的活跃产品数卡片。
+     * Get card of active product in usage report.
      *
      * @param  string $year
      * @param  string $month
      * @access public
-     * @return mixed
+     * @return array
      */
     public function getActiveProductCard($year, $month)
     {
@@ -1812,8 +1812,8 @@ class screenModel extends model
     }
 
     /**
-     * 获取项目任务概况表。
-     * Get table of project task summary.
+     * 获取应用健康度体检报告的项目任务概况表。
+     * Get table of project task summary in usage report.
      *
      * @param  string $year
      * @param  string $month
@@ -1830,6 +1830,11 @@ class screenModel extends model
             ->andWhere('month(date)')->eq($month)
             ->fetchAll();
 
+        $deletedExecutionList = $this->dao->select('id')->from(TABLE_EXECUTION)
+            ->where('deleted')->eq('1')
+            ->andWhere('type')->in('sprint,stage,kanban')
+            ->fetchPairs();
+
         $createdTaskActors = array();
         foreach($createdTaskActions as $projectAccount)
         {
@@ -1847,12 +1852,16 @@ class screenModel extends model
                 ->where('project')->eq($projectID)
                 ->andWhere('year(openedDate)')->eq($year)
                 ->andWhere('month(openedDate)')->eq($month)
+                ->andWhere('deleted')->eq('0')
+                ->andWhere('execution')->notin($deletedExecutionList)
                 ->fetchPairs();
 
             $finishedTaskList = $this->dao->select('id')->from(TABLE_TASK)
                 ->where('project')->eq($projectID)
                 ->andWhere('year(finishedDate)')->eq($year)
                 ->andWhere('month(finishedDate)')->eq($month)
+                ->andWhere('deleted')->eq('0')
+                ->andWhere('execution')->notin($deletedExecutionList)
                 ->fetchPairs();
 
             $row = new stdclass();