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

* [bug#56686,done,1h] fix bug.

Browse Source
This commit is contained in:
sunguangming
2024-11-04 08:55:08 +08:00
committed by 王怡栋
parent 518a0bf479
commit 827c39819a
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+4 -7
View File
@@ -1296,12 +1296,14 @@ class actionModel extends model
*/
public function computeBeginAndEnd(string $period, string $date, string $direction): array
{
$period = strtolower($period);
/* 1. 确切的日期。 */
/* 1. The exact date. */
if($date)
{
if($direction == 'next') return array('begin' => $date, 'end' => FUTURE_DATE);
if($direction == 'pre') return array('begin' => EPOCH_DATE, 'end' => $date);
if($direction == 'pre') return array('begin' => $date, 'end' => FUTURE_DATE);
if($direction == 'next') return array('begin' => EPOCH_DATE, 'end' => $date);
return array('begin' => $date, 'end' => $date);
}
@@ -1319,11 +1321,6 @@ class actionModel extends model
return array('begin' => $beginDate, 'end' => FUTURE_DATE);
}
/* 3. 时间段。 */
/* 3. Period. */
$period = strtolower($period);
if($period == 'all') return array('begin' => EPOCH_DATE, 'end' => FUTURE_DATE);
$this->app->loadClass('date');
$today = date('Y-m-d');