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

Merge branch 'test_sunjun1' into 'master'

Browse Source 
test_sunjun1

See merge request easycorp/zentaopms!3263
This commit is contained in:
孙广明
2022-05-07 02:03:15 +00:00
parent 192198a02f 48b8726600
commit 7e04ce3fb7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/class/holiday.class.php
+4 -4
View File
@@ -34,11 +34,11 @@ class holidayTest
*/
public function getListTest($year = '', $type = 'all')
{
$objects = $this->objectModel->getList($year = '', $type = 'all');
$objects = $this->objectModel->getList($year, $type);
if(dao::isError()) return dao::getError();
return $objects;
return count($objects);
}
/**
@@ -140,10 +140,10 @@ class holidayTest
if(dao::isError()) return dao::getError();
return $objects;
return count($objects);
}
public function getWorkingDaysTest($begin, $end)
public function getWorkingDaysTest($begin = '', $end = '')
{
$objects = $this->objectModel->getWorkingDays($begin, $end);