Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch feature/task-report of zentao/zentaopms (#9732)

Browse Source
This commit is contained in:
朱金勇
2025-06-20 13:38:44 +08:00
committed by Gitfox
parent 4294af56f5 5ab04c927a
commit a363dcc4dd
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/calc/system/scale/count_of_changed_story.php
+6 -1
View File
@@ -30,7 +30,12 @@ class count_of_changed_story extends baseCalc
{
if(empty($row->changedDate) || $row->status == 'changing' || $row->status == 'reviewing') return false;
if(!empty($row->executionStartDate) && !empty($row->executionEndDate) && $row->changedDate < $row->executionStartDate || $row->changedDate > $row->executionEndDate) return false;
$executionStartDate = new DateTime($row->executionStartDate);
$executionEndDate = new DateTime($row->executionEndDate);
$executionStartDate = $executionStartDate->modify('-1 day');
$executionEndDate = $executionEndDate->modify('+1 day');
$changedDate = new DateTime($row->changedDate);
if(!empty($row->executionStartDate) && !empty($row->executionEndDate) && ($changedDate < $executionStartDate || $changedDate > $executionEndDate)) return false;
$this->result ++;
}
module/metric/calc/system/scale/scale_of_changed_story.php
+6 -1
View File
@@ -31,8 +31,13 @@ class scale_of_changed_story extends baseCalc
if($row->isParent == '1') return false;
if(empty($row->estimate)) return false;
$executionStartDate = new DateTime($row->executionStartDate);
$executionEndDate = new DateTime($row->executionEndDate);
$executionStartDate = $executionStartDate->modify('-1 day');
$executionEndDate = $executionEndDate->modify('+1 day');
$changedDate = new DateTime($row->changedDate);
if(empty($row->changedDate) || $row->status == 'changing' || $row->status == 'reviewing') return false;
if(!empty($row->executionStartDate) && !empty($row->executionEndDate) && $row->changedDate < $row->executionStartDate || $row->changedDate > $row->executionEndDate) return false;
if(!empty($row->executionStartDate) && !empty($row->executionEndDate) && ($changedDate < $executionStartDate || $changedDate > $executionEndDate)) return false;
$this->result += $row->estimate;
}