...
|
...
|
@@ -64,8 +64,8 @@ class UserController extends RestBaseController |
|
|
if ($item['to_post_status']!=6){
|
|
|
$item['remark'] =null;
|
|
|
}
|
|
|
$item['end_time']=date('Y-m-d',$item['start_time']+$item['last']*60*60);
|
|
|
$item['start_time']=date('Y-m-d',$item['start_time']);
|
|
|
$item['end_time']=date('Y-m-d H:i:s',$item['start_time']+$item['last']*60*60);
|
|
|
$item['start_time']=date('Y-m-d H:i:s',$item['start_time']);
|
|
|
return $item;
|
|
|
});
|
|
|
$this->success('获取数据成功',$data);
|
...
|
...
|
@@ -97,8 +97,8 @@ class UserController extends RestBaseController |
|
|
->where($where)
|
|
|
->field('o.*,u1.user_nickname as u1user_nickname')
|
|
|
->select()->each(function ($item) {
|
|
|
$item['end_time']=date('Y-m-d',$item['start_time']+$item['last']*60*60);
|
|
|
$item['start_time']=date('Y-m-d',$item['start_time']);
|
|
|
$item['end_time']=date('Y-m-d H:i:s',$item['start_time']+$item['last']*60*60);
|
|
|
$item['start_time']=date('Y-m-d H:i:s',$item['start_time']);
|
|
|
return $item;
|
|
|
});
|
|
|
$this->success('获取数据成功',$data);
|
...
|
...
|
|