From 70e61fc3e201ac30346f9afe19c882d30ed22470 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Fri, 15 Sep 2023 09:45:59 +0800 Subject: [PATCH] + Add comment and params type. --- module/program/model.php | 8 +++++--- module/program/test/model/getpairsbylist.php | 10 ++++------ module/program/test/program.class.php | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/module/program/model.php b/module/program/model.php index 2d948841da..e249d2d564 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -152,14 +152,15 @@ class programModel extends model } /** + * 根据项目集ID列表获取项目集信息。 * Get program pairs by id list. * - * @param string|array $programIDList - * @param string $orderBy + * @param array $programIDList + * @param string $orderBy * @access public * @return array */ - public function getPairsByList($programIDList = '', $orderBy = 'order_asc') + public function getPairsByList(array $programIDList = array(), string $orderBy = 'order_asc'): array { return $this->dao->select('id, name')->from(TABLE_PROGRAM) ->where('id')->in($programIDList) @@ -223,6 +224,7 @@ class programModel extends model } /** + * 根据查询ID获取项目集列表。 * Get program list by search. * * @param string $orderBy diff --git a/module/program/test/model/getpairsbylist.php b/module/program/test/model/getpairsbylist.php index 886a49c0a2..46a87fd90b 100755 --- a/module/program/test/model/getpairsbylist.php +++ b/module/program/test/model/getpairsbylist.php @@ -33,12 +33,10 @@ pid=1 */ $programTester = new programTest(); -$programIdList = array('1', '1,2,3', array(1), array(1,2,3), '', '0', '11'); +$programIdList = array(array(1), array(1,2,3), '', '0', '11'); r($programTester->getPairsByListTest($programIdList[0])) && p('1') && e('项目集1'); // 通过字符串'1'获取项目集名称 r($programTester->getPairsByListTest($programIdList[1])) && p('1,2,3') && e('项目集1,项目集2,项目集3'); // 通过字符串'1,2,3'获取项目集名称 -r($programTester->getPairsByListTest($programIdList[2])) && p('1') && e('项目集1'); // 通过数组array(1)获取项目集名称 -r($programTester->getPairsByListTest($programIdList[3])) && p('1,2,3') && e('项目集1,项目集2,项目集3'); // 通过数组array(1,2,3)获取项目集名称 -r($programTester->getPairsByListTest($programIdList[4])) && p('') && e('0'); // 通过id为空获取项目集名称 -r($programTester->getPairsByListTest($programIdList[5])) && p('') && e('0'); // 通过id=0获取项目集名称 -r($programTester->getPairsByListTest($programIdList[6])) && p('') && e('0'); // 通过id=11获取项目集名称 +r($programTester->getPairsByListTest($programIdList[2])) && p('') && e('0'); // 通过id为空获取项目集名称 +r($programTester->getPairsByListTest($programIdList[3])) && p('') && e('0'); // 通过id=0获取项目集名称 +r($programTester->getPairsByListTest($programIdList[4])) && p('') && e('0'); // 通过id=11获取项目集名称 diff --git a/module/program/test/program.class.php b/module/program/test/program.class.php index ae5cba87b8..8a824c79b5 100644 --- a/module/program/test/program.class.php +++ b/module/program/test/program.class.php @@ -51,9 +51,9 @@ class programTest * @access public * @return array */ - public function getPairsByListTest($programIDList = '') + public function getPairsByListTest($programIDList = array()) { - return $this->program->getPairsByList($programIDList); + return $this->program->getPairsByList((array)$programIDList); } /**