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

* [refac] fix gantt error.

Browse Source
This commit is contained in:
tianshujie
2024-11-20 08:53:28 +08:00
committed by 刘梦艺
parent a40e8a0122
commit b3d026c2b5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/tao.php
+3 -3
View File
@@ -247,7 +247,7 @@ class programplanTao extends programplanModel
}
elseif($data->endDate > $data->start_date)
{
$durationDays = $this->holiday->getActualWorkingDays($data->start_date, $data->endDate);
$durationDays = $this->holiday->getActualWorkingDays($data->start_date, date('Y-m-d', strtotime($data->endDate)));
$data->duration = count($durationDays);
}
@@ -672,7 +672,7 @@ class programplanTao extends programplanModel
}
elseif($data->endDate > $data->start_date)
{
$durationDays = $this->loadModel('holiday')->getActualWorkingDays($data->start_date, $data->endDate);
$durationDays = $this->loadModel('holiday')->getActualWorkingDays($data->start_date, date('Y-m-d', strtotime($data->endDate)));
$data->duration = count($durationDays);
}
@@ -820,7 +820,7 @@ class programplanTao extends programplanModel
}
elseif($data->endDate > $data->start_date)
{
$durationDays = $this->loadModel('holiday')->getActualWorkingDays($data->start_date, $data->endDate);
$durationDays = $this->loadModel('holiday')->getActualWorkingDays($data->start_date, date('Y-m-d', strtotime($data->endDate)));
$data->duration = count($durationDays);
}
if($data->start_date) $data->start_date = date('d-m-Y', strtotime($data->start_date));