diff --git a/app/oa/controller/Approve.php b/app/oa/controller/Approve.php index c8e9c87..2c60f09 100644 --- a/app/oa/controller/Approve.php +++ b/app/oa/controller/Approve.php @@ -96,12 +96,11 @@ class Approve extends BaseController $map2[] = ['f.admin_id', '=', $param['uid']]; } //按时间检索 - $start_time = isset($param['start_time']) ? strtotime($param['start_time']) : 0; - $end_time = isset($param['end_time']) ? strtotime($param['end_time']) : 0; - if ($start_time > 0 && $end_time > 0) { - $map1[] = ['f.create_time', 'between', [$start_time, $end_time]]; - $map2[] = ['f.create_time', 'between', [$start_time, $end_time]]; - } + if (!empty($param['apply_time'])) { + $apply_time =explode('~', $param['apply_time']); + $map1[] = ['f.create_time', 'between', [strtotime(urldecode($apply_time[0])),strtotime(urldecode($apply_time[1]))]]; + $map2[] = ['f.create_time', 'between', [strtotime(urldecode($apply_time[0])),strtotime(urldecode($apply_time[1]))]]; + } $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; @@ -193,11 +192,10 @@ class Approve extends BaseController $map[] = ['f.admin_id', '=', $param['uid']]; } //按时间检索 - $start_time = isset($param['start_time']) ? strtotime($param['start_time']) : 0; - $end_time = isset($param['end_time']) ? strtotime($param['end_time']) : 0; - if ($start_time > 0 && $end_time > 0) { - $map[] = ['f.create_time', 'between', [$start_time, $end_time]]; - } + if (!empty($param['apply_time'])) { + $apply_time =explode('~', $param['apply_time']); + $map[] = ['f.create_time', 'between', [strtotime(urldecode($apply_time[0])),strtotime(urldecode($apply_time[1]))]]; + } $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $list = Db::name('Approve') diff --git a/app/oa/controller/Plan.php b/app/oa/controller/Plan.php index f0d97d3..a9373e5 100644 --- a/app/oa/controller/Plan.php +++ b/app/oa/controller/Plan.php @@ -19,14 +19,13 @@ class Plan extends BaseController { function index() { if (request()->isAjax()) { - $param = get_params(); - //按时间检索 - $start_time = isset($param['start_time']) ? strtotime($param['start_time']) : 0; - $end_time = isset($param['end_time']) ? strtotime($param['end_time']) : 0; - $where = []; - if ($start_time > 0 && $end_time > 0) { - $where[] = ['a.start_time', 'between', [$start_time, $end_time]]; + $param = get_params(); + //按时间检索 + if (!empty($param['diff_time'])) { + $diff_time =explode('~', $param['diff_time']); + $where[] = ['a.start_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]]; } + if (!empty($param['keywords'])) { $where[] = ['a.title', 'like', '%' . trim($param['keywords']) . '%']; } diff --git a/app/oa/controller/Schedule.php b/app/oa/controller/Schedule.php index 4f9f62b..4c318d2 100644 --- a/app/oa/controller/Schedule.php +++ b/app/oa/controller/Schedule.php @@ -20,9 +20,6 @@ class Schedule extends BaseController function index() { if (request()->isAjax()) { $param = get_params(); - //按时间检索 - $start_time = isset($param['start_time']) ? strtotime($param['start_time']) : 0; - $end_time = isset($param['end_time']) ? strtotime($param['end_time']) : 0; $tid = isset($param['tid']) ? $param['tid'] : 0; $where = []; if ($tid>0) { @@ -38,8 +35,10 @@ class Schedule extends BaseController if (!empty($param['keywords'])) { $where[] = ['a.title', 'like', '%' . trim($param['keywords']) . '%']; } - if ($start_time > 0 && $end_time > 0) { - $where[] = ['a.start_time', 'between', [$start_time, $end_time]]; + //按时间检索 + if (!empty($param['diff_time'])) { + $diff_time =explode('~', $param['diff_time']); + $where[] = ['a.start_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]]; } } $where[] = ['a.delete_time', '=', 0]; diff --git a/app/oa/controller/Work.php b/app/oa/controller/Work.php index c497c3a..c15c358 100644 --- a/app/oa/controller/Work.php +++ b/app/oa/controller/Work.php @@ -64,10 +64,9 @@ class Work extends BaseController $map[] = ['type', '=', $param['type']]; } //按时间检索 - $start_time = isset($param['start_time']) ? strtotime(urldecode($param['start_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"]; + if (!empty($param['diff_time'])) { + $diff_time =explode('~', $param['diff_time']); + $map[] = ['create_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]]; } $map[] = ['admin_id', '=', $this->uid]; $map[] = ['status', '=', 1]; @@ -87,10 +86,9 @@ class Work extends BaseController $map[] = ['a.to_uid', '=', $this->uid]; $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'].' 23:59:59')) : 0; - if ($start_time > 0 && $end_time > 0) { - $map[] = ['a.send_time', 'between', "$start_time,$end_time"]; + if (!empty($param['diff_time1'])) { + $diff_time =explode('~', $param['diff_time1']); + $map[] = ['send_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]]; } $list = $this->getList($map, $param); } diff --git a/app/oa/view/approve/copy.html b/app/oa/view/approve/copy.html index ead5bce..624d800 100644 --- a/app/oa/view/approve/copy.html +++ b/app/oa/view/approve/copy.html @@ -15,14 +15,8 @@ -