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

Merge branch 'sprint/213_mayue_bug#24832' into 'master'

Browse Source 
* Fix bug #24832.

See merge request easycorp/zentaopms!4382
This commit is contained in:
孙广明
2022-07-06 07:56:09 +00:00
parent 01e9f98e06 fbb92627b8
commit ada3b47db7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+2 -2
View File
@@ -3110,12 +3110,12 @@ class executionModel extends model
}
elseif((helper::today() >= $execution->begin) and (helper::today() <= $execution->end))
{
$begin = (date('Y-m-d', strtotime('-14 days')) < $execution->begin) ? $execution->begin : date('Y-m-d', strtotime('-14 days'));
$begin = (date('Y-m-d', strtotime('-13 days')) < $execution->begin) ? $execution->begin : date('Y-m-d', strtotime('-13 days'));
$end = helper::today();
}
elseif((helper::today() > $execution->end))
{
$begin = date($execution->end, strtotime('-14 days')) > $execution->begin ? date($execution->end, strtotime('-14 days')) : $execution->begin;
$begin = date($execution->end, strtotime('-13 days')) > $execution->begin ? date($execution->end, strtotime('-13 days')) : $execution->begin;
$end = $execution->end;
}