diff --git a/module/execution/model.php b/module/execution/model.php index 623e070514..0dc85235f3 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1872,18 +1872,18 @@ class executionModel extends model * 根据产品/执行等信息获取任务列表 * Get tasks by product/execution etc. * - * @param int $productID - * @param int $executionID - * @param array $executions - * @param string $browseType - * @param int $queryID - * @param int $moduleID - * @param string $sort - * @param object $pager + * @param int $productID + * @param int|array $executionID + * @param array $executions + * @param string $browseType + * @param int $queryID + * @param int $moduleID + * @param string $sort + * @param object $pager * @access public * @return array */ - public function getTasks(int $productID, int $executionID, array $executions, string $browseType, int $queryID, int $moduleID, string $sort, object $pager = null): array + public function getTasks(int $productID, int|array $executionID, array $executions, string $browseType, int $queryID, int $moduleID, string $sort, object $pager = null): array { if(common::isTutorialMode()) return $this->loadModel('tutorial')->getTasks(); diff --git a/module/task/model.php b/module/task/model.php index 1bee5f95b4..6475c859bd 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1727,7 +1727,7 @@ class taskModel extends model * 获取执行下的任务列表信息。 * Get the task list under a execution. * - * @param int $executionID + * @param int|array $executionID * @param int $productID * @param string|array $type all|assignedbyme|myinvolved|undone|needconfirm|assignedtome|finishedbyme|delayed|review|wait|doing|done|pause|cancel|closed|array('wait','doing','done','pause','cancel','closed') * @param array $modules @@ -1736,7 +1736,7 @@ class taskModel extends model * @access public * @return array */ - public function getExecutionTasks(int $executionID, int $productID = 0, string|array $type = 'all', array $modules = array(), string $orderBy = 'status_asc, id_desc', object $pager = null): array + public function getExecutionTasks(int|array $executionID, int $productID = 0, string|array $type = 'all', array $modules = array(), string $orderBy = 'status_asc, id_desc', object $pager = null): array { $tasks = $this->taskTao->fetchExecutionTasks($executionID, $productID, $type, $modules, $orderBy, $pager); if(empty($tasks)) return array(); diff --git a/module/task/tao.php b/module/task/tao.php index f8e8e7681c..f6c85fb6b2 100644 --- a/module/task/tao.php +++ b/module/task/tao.php @@ -467,7 +467,7 @@ class taskTao extends taskModel * 获取执行下的任务。 * Fetch tasks under execution by executionID(Todo). * - * @param int $executionID + * @param int|array $executionID * @param int $productID * @param string|array $type all|assignedbyme|myinvolved|undone|needconfirm|assignedtome|finishedbyme|delayed|review|wait|doing|done|pause|cancel|closed|array('wait','doing','done','pause','cancel','closed') * @param array $modules @@ -476,7 +476,7 @@ class taskTao extends taskModel * @access protected * @return object[] */ - protected function fetchExecutionTasks(int $executionID, int $productID = 0, string|array $type = 'all', array $modules = array(), string $orderBy = 'status_asc, id_desc', object $pager = null): array + protected function fetchExecutionTasks(int|array $executionID, int $productID = 0, string|array $type = 'all', array $modules = array(), string $orderBy = 'status_asc, id_desc', object $pager = null): array { if(is_string($type)) $type = strtolower($type); $orderBy = str_replace('pri_', 'priOrder_', $orderBy); @@ -492,7 +492,7 @@ class taskTao extends taskModel ->leftJoin(TABLE_TASKTEAM)->alias('t3')->on('t3.task = t1.id') ->beginIF($productID)->leftJoin(TABLE_MODULE)->alias('t4')->on('t1.module = t4.id')->fi() ->beginIF($this->config->edition == 'max' or $this->config->edition == 'ipd')->leftJoin(TABLE_DESIGN)->alias('t5')->on('t1.design= t5.id')->fi() - ->where('t1.execution')->eq((int)$executionID) + ->where('t1.execution')->in($executionID) ->beginIF($type == 'myinvolved') ->andWhere("((t3.`account` = '{$this->app->user->account}') OR t1.`assignedTo` = '{$this->app->user->account}' OR t1.`finishedby` = '{$this->app->user->account}')") ->fi()