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

* Fix date filter with same begin and end.

Browse Source
This commit is contained in:
zhouxin
2024-03-18 14:33:28 +08:00
parent fb7eb781e2
commit 7d65fab7a0
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/chart/model.php
+3
View File
@@ -648,6 +648,9 @@ class chartModel extends model
if(empty($begin) or empty($end)) break;
$begin = date('Y-m-d 00:00:00', strtotime($begin));
$end = date('Y-m-d 23:59:59', strtotime($end));
$value = "'$begin' and '$end'";
$filterFormat[$field] = array('operator' => 'BETWEEN', 'value' => $value);
break;
module/pivot/model.php
+3
View File
@@ -714,6 +714,9 @@ class pivotModel extends model
$begin = $default['begin'];
$end = $default['end'];
if(!empty($begin)) $begin = date('Y-m-d 00:00:00', strtotime($begin));
if(!empty($end)) $end = date('Y-m-d 23:59:59', strtotime($end));
if(!empty($begin) && empty($end)) $filterFormat[$field] = array('operator' => '>', 'value' => "'{$begin}'");
if( empty($begin) && !empty($end)) $filterFormat[$field] = array('operator' => '<', 'value' => "'{$end}'");
if(!empty($begin) && !empty($end)) $filterFormat[$field] = array('operator' => 'BETWEEN', 'value' => "'{$begin}' AND '{$end}'");