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

* [bug#60959,done,0.5h] modify logic of dataset.

Browse Source
This commit is contained in:
zhouxin
2025-03-28 16:33:48 +08:00
committed by 胡方舟
parent e47d66e839
commit 4345397954
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/calc/project/hour/consume_of_all_in_project.php
+1 -1
View File
@@ -22,7 +22,7 @@ class consume_of_all_in_project extends baseCalc
{
public $dataset = 'getProjectEfforts';
public $fieldList = array('t3.id as project', 't1.consumed');
public $fieldList = array('t2.id as project', 't1.consumed');
public $result = array();
module/metric/calc/project/hour/day_of_invested_in_project.php
+1 -1
View File
@@ -22,7 +22,7 @@ class day_of_invested_in_project extends baseCalc
{
public $dataset = 'getProjectEfforts';
public $fieldList = array('t3.id as project', 't1.consumed');
public $fieldList = array('t2.id as project', 't1.consumed');
public $result = array();
module/metric/dataset.php
+4 -5
View File
@@ -1176,13 +1176,12 @@ class dataset
$stmt = $this->dao->select("$fieldList, $defaultHours as defaultHours")
->from(TABLE_EFFORT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.execution=t2.id')
->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project=t3.id')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.deleted')->eq('0')
->andWhere('t3.deleted')->eq('0')
->andWhere('t3.type')->eq('project');
->andWhere('t2.deleted')->eq('0')
->andWhere('t2.type')->eq('project');
return $this->defaultWhere($stmt, 't3');
return $this->defaultWhere($stmt, 't2');
}
/**