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

* fix bug #27292.

Browse Source
This commit is contained in:
wangyidong
2022-09-06 15:26:01 +08:00
parent 249913cd5a
commit 358e54302d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/weekly/model.php
+7 -2
View File
@@ -240,6 +240,7 @@ class weeklyModel extends model
->andWhere("(status='done' or closedReason= 'done')")
->andWhere('finishedDate')->ge($monday)
->andWhere('finishedDate')->le($sunday)
->andWhere('deleted')->eq(0)
->fetchAll();
return $this->loadModel('task')->processTasks($tasks);
}
@@ -267,6 +268,7 @@ class weeklyModel extends model
->andWhere('status')->in('wait,doing,pause')
->andWhere('deadline')->ge($monday)
->andWhere('deadline')->le($sunday)
->andWhere('deleted')->eq(0)
->fetchAll('id');
$postponed = $this->dao->select('*')
@@ -275,6 +277,7 @@ class weeklyModel extends model
->andWhere('finishedDate')->gt($nextMonday)
->andWhere('deadline')->ge($monday)
->andWhere('deadline')->lt($nextMonday)
->andWhere('deleted')->eq(0)
->fetchAll('id');
$tasks = array_merge($unFinished, $postponed);
@@ -303,6 +306,7 @@ class weeklyModel extends model
->from(TABLE_TASK)
->where('execution')->in($executionIdList)
->andWhere("((deadline > '$nextMonday' and deadline < '$sencondMondy') or (estStarted > '$nextMonday' and estStarted < '$sencondMondy'))")
->andWhere('deleted')->eq(0)
->fetchAll('id');
return $this->loadModel('task')->processTasks($tasks);
@@ -330,6 +334,7 @@ class weeklyModel extends model
return $this->dao->select('type, sum(cast(estimate as decimal(10,2))) as workload')
->from(TABLE_TASK)
->where('execution')->in($executionIdList)
->andWhere('deleted')->eq(0)
->groupBy('type')
->fetchPairs();
}
@@ -355,6 +360,7 @@ class weeklyModel extends model
->from(TABLE_TASK)
->where('execution')->in($executionIdList)
->andWhere('deadline')->ge($monday)
->andWhere('deleted')->eq(0)
->fetchAll('id');
}
@@ -385,8 +391,7 @@ class weeklyModel extends model
->where('execution')->in($executionIdList)
->andWhere("parent")->ge(0)
->andWhere("deleted")->eq(0)
->andWhere("estStarted")->ge($monday)
->andWhere("estStarted")->lt($nextMonday)
->andWhere("((estStarted >= '$monday' AND estStarted < '$nextMonday') OR (deadline >= '$monday' AND deadline < '$nextMonday') OR (estStarted < '$monday' AND deadline > '$nextMonday'))")
->fetchAll('id');
$PV = 0;