diff --git a/application/agent/controller/Report.php b/application/agent/controller/Report.php index 02a76b4..ac1292e 100755 --- a/application/agent/controller/Report.php +++ b/application/agent/controller/Report.php @@ -309,14 +309,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -505,13 +505,13 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); } @@ -1032,13 +1032,13 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); } @@ -2054,14 +2054,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -2172,14 +2172,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -2269,14 +2269,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -2819,14 +2819,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -2869,13 +2869,13 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); } @@ -3075,14 +3075,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3168,14 +3168,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3275,14 +3275,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3366,14 +3366,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3479,14 +3479,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3574,14 +3574,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3683,14 +3683,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -3895,14 +3895,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -3994,14 +3994,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -4100,14 +4100,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); }