* Finish task #97630.

This commit is contained in:
sunguangming
2023-07-25 16:22:17 +08:00
parent d6c45286d0
commit 7a1899ac9c
7 changed files with 324 additions and 7 deletions
+2 -1
View File
@@ -230,9 +230,10 @@ class testtaskModel extends model
*/
public function getExecutionTasks($executionID, $objectType = 'execution', $orderBy = 'id_desc', $pager = null)
{
return $this->dao->select('t1.*, t2.name AS buildName')
return $this->dao->select('t1.*, t2.name AS buildName, t3.name AS productName')
->from(TABLE_TESTTASK)->alias('t1')
->leftJoin(TABLE_BUILD)->alias('t2')->on('t1.build = t2.id')
->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product = t3.id')
->where('t1.deleted')->eq(0)
->beginIF($objectType == 'execution')->andWhere('t1.execution')->eq((int)$executionID)->fi()
->beginIF($objectType == 'project')->andWhere('t1.project')->eq((int)$executionID)->fi()