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

Merge branch 'feature/doctemplate' into release/21.7.2

Browse Source
This commit is contained in:
xieqiyu
2025-06-18 02:18:57 +00:00
parent c9c2fb2e63 1cd90a2cd0
commit 2155a40448
174 changed files with 7507 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+2 -2
View File
@@ -1741,7 +1741,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
@@ -1750,7 +1750,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();
module/task/tao.php
+2 -2
View File
@@ -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);