From af0b2bf817f7b9a1a5fe1727d3f0f74955384d73 Mon Sep 17 00:00:00 2001 From: hdm Date: Mon, 29 May 2023 23:39:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=B7=A5=E4=BD=9C=E6=B1=87?= =?UTF-8?q?=E6=8A=A5=E5=88=97=E8=A1=A8=EF=BC=8C=E6=8C=89=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B7=B2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/oa/controller/Work.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/oa/controller/Work.php b/app/oa/controller/Work.php index 12b66cb..c497c3a 100644 --- a/app/oa/controller/Work.php +++ b/app/oa/controller/Work.php @@ -65,7 +65,7 @@ class Work extends BaseController } //按时间检索 $start_time = isset($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0; - $end_time = isset($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0; + $end_time = isset($param['end_time']) ? strtotime(urldecode($param['end_time'].' 23:59:59')) : 0; if ($start_time > 0 && $end_time > 0) { $map[] = ['create_time', 'between', "$start_time,$end_time"]; } @@ -88,9 +88,9 @@ class Work extends BaseController $map[] = ['a.status', '=', 1]; //按时间检索 $start_time = isset($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0; - $end_time = isset($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0; + $end_time = isset($param['end_time']) ? strtotime(urldecode($param['end_time'].' 23:59:59')) : 0; if ($start_time > 0 && $end_time > 0) { - $map[] = ['w.send_time', 'between', "$start_time,$end_time"]; + $map[] = ['a.send_time', 'between', "$start_time,$end_time"]; } $list = $this->getList($map, $param); }