From 59c4b2b41f9d65adbf4fe4c4308a2aeb372129e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Thu, 16 Sep 2021 10:11:23 +0800 Subject: [PATCH] * Finish task #42588. --- module/report/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/report/model.php b/module/report/model.php index 05520623d3..547c5d3a82 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -317,9 +317,9 @@ class reportModel extends model $stmt = $this->dao->select('t1.*, t2.name as executionName')->from(TABLE_TASK)->alias('t1') ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id') ->where('t1.deleted')->eq(0) - ->andWhere('t1.status')->in('wait,doing') + ->andWhere('t1.status')->in('wait,pause,doing') ->andWhere('t2.deleted')->eq(0) - ->andWhere('t2.status')->in('wait, doing') + ->andWhere('t2.status')->in('wait,suspended,doing') ->andWhere('assignedTo')->ne(''); $allTasks = $stmt->fetchAll('id');