...
|
...
|
@@ -1180,6 +1180,7 @@ class SecondController extends RestBaseController |
|
|
foreach ($info as $k=>$v){
|
|
|
$info[$k]['start_time']=date('Y-m-d',$v['start_time']);
|
|
|
$info[$k]['end_time']=date('Y-m-d',$v['end_time']);
|
|
|
$info[$k]['work_time']=db('join')->where(['activity_id'=>$v['id'],'user_id'=>$user_id])->value('work_time');
|
|
|
}
|
|
|
$this->success('',$info);
|
|
|
}
|
...
|
...
|
|