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

* Fetch metric list with date type.

Browse Source
This commit is contained in:
zhouxin
2024-03-05 13:29:17 +08:00
parent 4cb8b2f01e
commit 63f19cdbe9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/model.php
+2 -2
View File
@@ -303,7 +303,7 @@ class metricModel extends model
* @access public
* @return array|false
*/
public function getList($scope, $stage = 'all', $param = 0, $type = '', $queryID = 0, $sort = 'id_desc', $pager = null)
public function getList($scope, $stage = 'all', $dateType = 'all', $param = 0, $type = '', $queryID = 0, $sort = 'id_desc', $pager = null)
{
if($queryID)
{
@@ -330,7 +330,7 @@ class metricModel extends model
$query = $type == 'bysearch' ? $this->session->metricQuery : '';
$metrics = $this->metricTao->fetchMetrics($scope, $stage, $object, $purpose, $query, $sort, $pager);
$metrics = $this->metricTao->fetchMetrics($scope, $stage, $object, $purpose, $dateType, $query, $sort, $pager);
$metrics = $this->processOldMetrics($metrics);
return $metrics;
module/metric/tao.php
+2 -1
View File
@@ -26,7 +26,7 @@ class metricTao extends metricModel
* @access protected
* @return void
*/
protected function fetchMetrics($scope, $stage = 'all', $object = '', $purpose = '', $query = '', $sort = 'id_desc', $pager = null)
protected function fetchMetrics($scope, $stage = 'all', $object = '', $purpose = '', $dateType = 'all', $query = '', $sort = 'id_desc', $pager = null)
{
$metrics = $this->dao->select('*')->from(TABLE_METRIC)
->where('deleted')->eq('0')
@@ -36,6 +36,7 @@ class metricTao extends metricModel
->beginIF($stage != 'all')->andWhere('stage')->eq($stage)->fi()
->beginIF(!empty($object))->andWhere('object')->eq($object)->fi()
->beginIF(!empty($purpose))->andWhere('purpose')->eq($purpose)->fi()
->beginIF($dateType != 'all')->andWhere('dateType')->eq($dateType)->fi()
->beginIF($sort)->orderBy($sort)->fi()
->beginIF($pager)->page($pager)->fi()
->fetchAll();