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

* Fix bug #3642.

Browse Source
This commit is contained in:
holan20180123
2020-12-08 10:28:35 +08:00
parent bfce366ef1
commit 653f817e83
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+8 -5
View File
@@ -551,12 +551,15 @@ class testtaskModel extends model
*/
public function getLinkableCasesByTestTask($testTask, $linkedCases, $query, $pager)
{
$caseList = $this->dao->select("`case`")->from(TABLE_TESTRUN)->where('task')->eq($testTask)->andWhere('`case`')->notin($linkedCases)->fetchPairs('case');
$query = preg_replace('/`(\w+)`/', 't1.`$1`', $query);
return $this->dao->select("*")->from(TABLE_CASE)->where($query)
->andWhere('id')->in($caseList)
->andWhere('PRJ')->eq($this->session->PRJ)
->andWhere('status')->ne('wait')
return $this->dao->select("t1.*,t2.lastRunner,t2.lastRunDate,t2.lastRunResult")->from(TABLE_CASE)->alias('t1')
->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.id = t2.case')
->where($query)
->andWhere('t1.id')->notin($linkedCases)
->andWhere('t2.task')->eq($testTask)
->andWhere('t1.PRJ')->eq($this->session->PRJ)
->andWhere('t1.status')->ne('wait')
->page($pager)
->fetchAll();
}