From ac96aa187eb37c3eecf860dc261593edd335efbb Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 3 Dec 2021 10:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementController.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 87ceb03f8..5f6b39ac7 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -1965,8 +1965,10 @@ class CompanyStatementController extends ThinkController if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { $map['payed_time'] = ['between', [$start_time, $end_time]]; - $radioMap['_string'] = "(begin_time>{$start_time} and begin_time<{$end_time}) - or (end_time>{$start_time} and (end_time<{$end_time} and end_time!=0)) or (begin_time<{$start_time} and end_time>{$end_time}) or (begin_time<{$start_time} and end_time = 0)"; + $radioMap['_string'] = "(begin_time >= {$start_time} and begin_time <= {$end_time}) + or (begin_time <= {$start_time} and end_time = 0) + or (end_time >= {$start_time} and (end_time <= {$end_time} and end_time != 0)) + or (begin_time <= {$start_time} and end_time >= {$end_time}) "; } elseif (isset($_REQUEST['time_start'])) { $map['payed_time'] = ['GT', $start_time];