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

* Filter deleted product in usage report.

Browse Source
This commit is contained in:
zhouxin
2023-10-08 14:33:18 +08:00
parent 50d5175f11
commit ce05696012
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/model.php
+9 -7
View File
@@ -1795,13 +1795,15 @@ class screenModel extends model
*/
public function getActiveProductCard($year, $month)
{
$activeProductCount = $this->dao->select('count(distinct product) as count')->from(TABLE_ACTION)
->where('product')->ne(',0,')
->andWhere('product')->ne(',,')
->andWhere('product')->ne(',,0,,')
->andWhere('objectType')->notin('project,execution,task')
->andWhere('year(date)')->eq($year)
->andWhere('month(date)')->eq($month)
$activeProductCount = $this->dao->select('count(distinct product) as count')->from(TABLE_ACTION)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
->where('t1.product')->ne(',0,')
->andWhere('t1.product')->ne(',,')
->andWhere('t1.product')->ne(',,0,,')
->andWhere('t1.objectType')->notin('project,execution,task')
->andWhere('year(t1.date)')->eq($year)
->andWhere('month(t1.date)')->eq($month)
->andWhere('t2.deleted')->eq('0')
->fetch();
$activeProductCard = new stdclass();