From ceee0ec822ccd5f1ce599f47ed5c6a0455268186 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 11 May 2023 21:01:54 +0800 Subject: [PATCH] * Change the if...else to several if. --- .../test/model/checkrequired4batchcreate.php | 4 +- .../test/model/updatekanban4batchcreate.php | 10 ++-- module/task/test/task.class.php | 56 +++++++++---------- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/module/task/test/model/checkrequired4batchcreate.php b/module/task/test/model/checkrequired4batchcreate.php index 5adb7a0934..6005746f15 100755 --- a/module/task/test/model/checkrequired4batchcreate.php +++ b/module/task/test/model/checkrequired4batchcreate.php @@ -194,5 +194,5 @@ r($task->checkRequired4BatchCreateTest($executionIdList[6], $devStageTask, true) r($task->checkRequired4BatchCreateTest($executionIdList[0], $conformLimitedTask, false, true)) && p('deadline:0') && e('任务截止日期应小于等于执行的结束日期：2023-02-01。'); // 测试开启起止日期限制，创建的任务截止日期大于执行的截止日期 r($task->checkRequired4BatchCreateTest($executionIdList[0], $unConformLimitedTask, false, true)) && p('1:name') && e('task1'); // 测试开启起止日期限制，创建的任务截止日期小于执行的截止日期 r($task->checkRequired4BatchCreateTest($executionIdList[0], $deadlineSmallTask)) && p('message:0') && e('"截止日期"必须大于"预计开始"'); // 测试任务截止日期小于任务的截止日期 -r($task->checkRequired4BatchCreateTest($executionIdList[0], $estimateNumberTask)) && p('message:0') && e('"最初预计"必须为数字'); // 测试任务预计工时不为数字的情况 -r($task->checkRequired4BatchCreateTest($executionIdList[0], $negativeNumberTask)) && p('message:0') && e('"最初预计"必须为数字'); // 测试任务预计工时为负数的情况 +r($task->checkRequired4BatchCreateTest($executionIdList[0], $estimateNumberTask)) && p('message:0') && e('"最初预计"必须为正数'); // 测试任务预计工时不为数字的情况 +r($task->checkRequired4BatchCreateTest($executionIdList[0], $negativeNumberTask)) && p('message:0') && e('"最初预计"必须为正数'); // 测试任务预计工时为负数的情况 diff --git a/module/task/test/model/updatekanban4batchcreate.php b/module/task/test/model/updatekanban4batchcreate.php index 8133acf164..36d5b7ae30 100755 --- a/module/task/test/model/updatekanban4batchcreate.php +++ b/module/task/test/model/updatekanban4batchcreate.php @@ -25,9 +25,9 @@ $columnIdList = array('1', '2', '3', '4', '5', '6', '7', '8', '9', '0'); $task = new taskTest(); -r($task->updateKanban4BatchCreateTest($taskIdList[1], $executionIdList[2], $laneIdList[1], $columnIdList[1])) && p() && e(',2,'); // 综合研发界面下看板项目的任务泳道未开始列无卡片的情况。 -r($task->updateKanban4BatchCreateTest($taskIdList[1], $executionIdList[2], $laneIdList[2], $columnIdList[2])) && p() && e(',2,5,6,805,'); // 综合研发界面下看板项目的任务泳道未开始列有卡片的情况。 -r($task->updateKanban4BatchCreateTest($taskIdList[2], $executionIdList[2], $laneIdList[9], $columnIdList[2])) && p() && e('0'); // 综合研发界面下看板项目任务泳道为空未开始列的情况。 -r($task->updateKanban4BatchCreateTest($taskIdList[2], $executionIdList[2], $laneIdList[9], $columnIdList[2])) && p() && e('0'); // 综合研发界面下看板项目任务泳道列为空的情况。 -r($task->updateKanban4BatchCreateTest($taskIdList[5], $executionIdList[3], $laneIdList[1], $columnIdList[2], 'lite')) && p() && e(',6,'); // 运营管理界面下看板项目任务泳道未开始列无卡片的情况。 +r($task->updateKanban4BatchCreateTest($taskIdList[1], $executionIdList[2], $laneIdList[1], $columnIdList[1])) && p() && e(',2,'); // 综合研发界面下看板项目的任务泳道未开始列无卡片的情况。 +r($task->updateKanban4BatchCreateTest($taskIdList[1], $executionIdList[2], $laneIdList[2], $columnIdList[2])) && p() && e(',2,5,6,805,'); // 综合研发界面下看板项目的任务泳道未开始列有卡片的情况。 +r($task->updateKanban4BatchCreateTest($taskIdList[2], $executionIdList[2], $laneIdList[9], $columnIdList[2])) && p() && e('0'); // 综合研发界面下看板项目任务泳道为空未开始列的情况。 +r($task->updateKanban4BatchCreateTest($taskIdList[2], $executionIdList[2], $laneIdList[9], $columnIdList[2])) && p() && e('0'); // 综合研发界面下看板项目任务泳道列为空的情况。 +r($task->updateKanban4BatchCreateTest($taskIdList[5], $executionIdList[3], $laneIdList[1], $columnIdList[2], 'lite')) && p() && e(',6,'); // 运营管理界面下看板项目任务泳道未开始列无卡片的情况。 r($task->updateKanban4BatchCreateTest($taskIdList[5], $executionIdList[3], $laneIdList[3], $columnIdList[3], 'lite')) && p() && e(',6,7,8,807,'); // 运营管理界面下看板项目任务泳道未开始列有卡片的情况。 diff --git a/module/task/test/task.class.php b/module/task/test/task.class.php index a992f52bc9..d1460af5af 100644 --- a/module/task/test/task.class.php +++ b/module/task/test/task.class.php @@ -93,9 +93,9 @@ class taskTest * @param bool $verifyScore * @param array $output * @access public - * @return object|int + * @return array|object|int|false */ - public function batchCreateObject($data = array(), $executionID = 0, $taskID = 0, $storyID = 0, $verifyScore = false, $output = array()) + public function batchCreateObject(array $data = array(), int $executionID = 0, int $taskID = 0, int $storyID = 0, bool $verifyScore = false, array $output = array()): array|object|int|false { global $tester; @@ -105,7 +105,7 @@ class taskTest $lastScore = $tester->dao->select('after')->from(TABLE_SCORE)->orderBy('id_desc')->limit(1)->fetch('after'); - $objectIdList = $this->objectModel->batchCreate($execution, $data, $output); + $objectIdList = $this->objectModel->batchCreate($execution, $data, $taskID, $output); $childTask = array(); if(!dao::isError()) $childTask = $this->objectModel->getById(current($objectIdList)); @@ -114,22 +114,26 @@ class taskTest { return dao::getError(); } - elseif(!empty($taskID)) + + if(!empty($taskID)) { $parentTask = $this->objectModel->getById($childTask->parent); return $parentTask; } - elseif(!empty($storyID)) + + if(!empty($storyID)) { $releatedStory = $tester->loadModel('story')->getById($childTask->story); return $releatedStory; } - elseif($verifyScore) + + if($verifyScore) { $score = $tester->dao->select('after')->from(TABLE_SCORE)->orderBy('id_desc')->limit(1)->fetch('after'); return $score == $lastScore + 1; } - elseif(!empty($output)) + + if(!empty($output)) { $laneID = isset($output['laneID']) ? $output['laneID'] : 0; $columnID = isset($output['columnID']) ? $output['columnID'] : 0; @@ -146,10 +150,8 @@ class taskTest return $task ? $task : false; } - else - { - return count($objectIdList); - } + + return count($objectIdList); } /** @@ -1756,7 +1758,7 @@ class taskTest * @access public * @return string */ - public function updateKanban4BatchCreateTest($taskID, $executionID, $laneID, $columnID, $vision = 'rnd') + public function updateKanban4BatchCreateTest(int $taskID, int $executionID, int $laneID, int $columnID, string $vision = 'rnd'): string { global $tester; @@ -1827,7 +1829,6 @@ class taskTest * @param array $teamEstimateList * @param array|bool $teamConsumedList * @param array|bool $teamLeftList - * @access public * @return array */ @@ -1999,13 +2000,13 @@ class taskTest * checkRequired4BatchCreateTest * * @param int $executionID - * @param int $data - * @param int $checkRequiredItem - * @param int $checkLimitTaskDate + * @param array $data + * @param bool $checkRequiredItem + * @param bool $checkLimitTaskDate * @access public - * @return void + * @return array */ - public function checkRequired4BatchCreateTest($executionID, $data, $checkRequiredItem = false, $checkLimitTaskDate = false) + public function checkRequired4BatchCreateTest(int $executionID, array $data, bool $checkRequiredItem = false, bool $checkLimitTaskDate = false): array { global $tester; @@ -2025,10 +2026,9 @@ class taskTest return $result; } - elseif($checkLimitTaskDate) - { - $tester->loadModel('setting'); + if($checkLimitTaskDate) + { $this->objectModel->config->limitTaskDate = 1; $result = $this->objectModel->checkRequired4BatchCreate($execution, $data); @@ -2042,16 +2042,14 @@ class taskTest return $result; } - else - { - $result = $this->objectModel->checkRequired4BatchCreate($execution, $data); - if(dao::isError()) - { - return dao::getError(); - } - return $result; + $result = $this->objectModel->checkRequired4BatchCreate($execution, $data); + if(dao::isError()) + { + return dao::getError(); } + return $result; + } }