|
|
@@ -232,16 +232,55 @@ class System extends Base
|
|
|
foreach($result as $key=>$vo){
|
|
|
if($result[$key]['intime'] != 0){
|
|
|
$result[$key]['intime'] = date('Y-m-d H:i:s', $vo['intime']);
|
|
|
+
|
|
|
+ $date = explode(' ',$result[$key]['intime']);
|
|
|
+ $year = explode('-',$result[$key]['intime']);
|
|
|
+ if($date[0] == date('Y-m-d',time())){
|
|
|
+ $result[$key]['intime'] = '<span style="float: right;">'.$date[1].'</span>';
|
|
|
+ }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
|
|
|
+ $result[$key]['intime'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
|
|
|
+ }else{
|
|
|
+ if($year[0] == date('Y',time())){
|
|
|
+ $result[$key]['intime'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($result[$key]['intime'])).'</span>';
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}else{
|
|
|
$result[$key]['intime'] = '-';
|
|
|
}
|
|
|
if($result[$key]['start_time'] != 0){
|
|
|
$result[$key]['start_time'] = date('Y-m-d H:i:s', $vo['start_time']);
|
|
|
+
|
|
|
+ $date = explode(' ',$result[$key]['start_time']);
|
|
|
+ $year = explode('-',$result[$key]['start_time']);
|
|
|
+ if($date[0] == date('Y-m-d',time())){
|
|
|
+ $result[$key]['start_time'] = '<span style="float: right;">'.$date[1].'</span>';
|
|
|
+ }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
|
|
|
+ $result[$key]['start_time'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
|
|
|
+ }else{
|
|
|
+ if($year[0] == date('Y',time())){
|
|
|
+ $result[$key]['start_time'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($result[$key]['start_time'])).'</span>';
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}else{
|
|
|
$result[$key]['start_time'] = '-';
|
|
|
}
|
|
|
if($result[$key]['end_time'] != 0){
|
|
|
$result[$key]['end_time'] = date('Y-m-d H:i:s', $vo['end_time']);
|
|
|
+
|
|
|
+ $date = explode(' ',$result[$key]['end_time']);
|
|
|
+ $year = explode('-',$result[$key]['end_time']);
|
|
|
+ if($date[0] == date('Y-m-d',time())){
|
|
|
+ $result[$key]['end_time'] = '<span style="float: right;">'.$date[1].'</span>';
|
|
|
+ }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
|
|
|
+ $result[$key]['end_time'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
|
|
|
+ }else{
|
|
|
+ if($year[0] == date('Y',time())){
|
|
|
+ $result[$key]['end_time'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($result[$key]['end_time'])).'</span>';
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}else{
|
|
|
$result[$key]['end_time'] = '-';
|
|
|
}
|