mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布工作汇报列表，按时间搜索显示错误的问题已修复

Browse Source
This commit is contained in:
hdm 2023-05-29 23:39:11 +08:00
parent e689b90f47
commit af0b2bf817
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/oa/controller/Work.php
View File

@ -65,7 +65,7 @@ class Work extends BaseController
} }
//按时间检索 //按时间检索
$start_time = isset($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0; $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) { if ($start_time > 0 && $end_time > 0) {
$map[] = ['create_time', 'between', "$start_time,$end_time"]; $map[] = ['create_time', 'between', "$start_time,$end_time"];
} }
@ -88,9 +88,9 @@ class Work extends BaseController
$map[] = ['a.status', '=', 1]; $map[] = ['a.status', '=', 1];
//按时间检索 //按时间检索
$start_time = isset($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0; $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) { 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); $list = $this->getList($map, $param);
} }