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

Merge branch 'tianshujie_bug' into 'master'

Browse Source 
* Modified Obtain the configuration information about the workweek.

See merge request easycorp/zentaopms!6229
This commit is contained in:
王怡栋
2022-11-18 02:09:50 +00:00
parent 028547730b e31283d2f9
commit d51ac9506a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/holiday/model.php
+2 -1
View File
@@ -198,12 +198,13 @@ class holidayModel extends model
{
if(empty($begin) or empty($end) or $begin == '0000-00-00' or $end == '0000-00-00') return array();
$this->app->loadConfig('execution');
$actualDays = array();
$currentDay = $begin;
$holidays = $this->getHolidays($begin, $end);
$workingDays = $this->getWorkingDays($begin, $end);
$weekend = isset($this->config->project->weekend) ? $this->config->project->weekend : 2;
$weekend = isset($this->config->execution->weekend) ? $this->config->execution->weekend : 2;
$holidaysFlip = array_flip($holidays);
$workingDaysFlip = array_flip($workingDays);