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

* [task#146862,done,2h] Compatible dm.

Browse Source
This commit is contained in:
daitingting
2025-07-23 14:37:38 +08:00
parent d1624cadf6
commit 22638d2ca6
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/model.php
+9 -3
View File
@@ -1538,7 +1538,9 @@ class metricModel extends model
->where('deleted')->eq(0)
->andWhere('shadow')->eq(0)
->andWhere('createdDate')->le($date)
->andWhere("if(closedDate IS NOT NULL and YEAR(closedDate)!='0000', closedDate>='$date', true)")
->andWhere("closedDate IS NOT NULL and YEAR(closedDate)!='0000'", true)
->orWhere('closedDate')->ge($date)
->markRight(1)
->andWhere("vision LIKE '%{$vision}%'", true)
->orWhere("vision IS NULL")->markRight(1)
->fetchPairs();
@@ -1548,7 +1550,9 @@ class metricModel extends model
->where('deleted')->eq(0)
->andWhere('type')->eq('project')
->andWhere('openedDate')->le($date)
->andWhere("if(closedDate IS NOT NULL and YEAR(closedDate)!='0000', closedDate>='$date', true)")
->andWhere("closedDate IS NOT NULL and YEAR(closedDate)!='0000'", true)
->orWhere('closedDate')->ge($date)
->markRight(1)
->andWhere("vision LIKE '%{$vision}%'", true)
->orWhere("vision IS NULL")->markRight(1)
->fetchPairs();
@@ -1558,7 +1562,9 @@ class metricModel extends model
->where('deleted')->eq(0)
->andWhere('type')->in('sprint,stage,kanban')
->andWhere('openedDate')->le($date)
->andWhere("if(closedDate IS NOT NULL and YEAR(closedDate)!='0000', closedDate>='$date', true)")
->andWhere("closedDate IS NOT NULL and YEAR(closedDate)!='0000'", true)
->orWhere('closedDate')->ge($date)
->markRight(1)
->andWhere("vision LIKE '%{$vision}%'", true)
->orWhere("vision IS NULL")->markRight(1)
->fetchPairs();
module/pivot/tao.php
+2 -2
View File
@@ -308,8 +308,8 @@ class pivotTao extends pivotModel
{
return $this->dao->select(<<<EOT
t1.id,
IF(t1.mode = '', t1.assignedTo, t4.account) AS user,
IF(t1.mode = '', ROUND(t1.left, 2), ROUND(t4.left, 2)) AS 'left',
CASE WHEN t1.mode = '' THEN t1.assignedTo ELSE t4.account END AS user,
CASE WHEN t1.mode = '' THEN ROUND(t1.left, 2) ELSE ROUND(t4.left, 2) END AS left,
t2.multiple,
t2.id AS executionID,
t2.name AS executionName,