...
|
...
|
@@ -484,11 +484,15 @@ class SecondController extends RestBaseController |
|
|
if (!empty($return)){
|
|
|
$this->success('',$return);
|
|
|
}else{
|
|
|
$this->error('');
|
|
|
$this->error('暂无信息' );
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private function myTime($user_id,$team_id){
|
|
|
$map['user_id']=$user_id;
|
|
|
$map['team_id']=$team_id;
|
...
|
...
|
@@ -882,7 +886,11 @@ class SecondController extends RestBaseController |
|
|
* @url /index/second/zhengJianInfo
|
|
|
* @method POST
|
|
|
*
|
|
|
*
|
|
|
* @return avatar:头像信息
|
|
|
* @return name:姓名
|
|
|
* @return status:状态
|
|
|
* @return user_num:编号
|
|
|
* @return work_time:工作时长
|
|
|
*
|
|
|
*@header name:XX-Token require:1 default: desc:token
|
|
|
*
|
...
|
...
|
@@ -895,8 +903,6 @@ class SecondController extends RestBaseController |
|
|
$this->success('',$info);
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
* @title 生成电子证件(暂无)
|
|
|
* @description 生成电子证件
|
...
|
...
|
@@ -1034,6 +1040,39 @@ class SecondController extends RestBaseController |
|
|
$this->success('',$info);
|
|
|
}
|
|
|
/**
|
|
|
* @title 待提交报告(new)
|
|
|
* @description 待提交报告
|
|
|
* @author sgj
|
|
|
* @url /index/second/startClock
|
|
|
* @method POST
|
|
|
*
|
|
|
*
|
|
|
*@param name:id type:int require:1 other: desc:活动id
|
|
|
*@param name:long type:int require:1 other: desc:经度
|
|
|
*@param name:lat type:int require:1 other: desc:纬度
|
|
|
*@header name:XX-Token require:1 default: desc:token
|
|
|
*
|
|
|
*
|
|
|
*@throws
|
|
|
*/
|
|
|
public function commitList(){
|
|
|
$user_id=input('id');
|
|
|
$map['user_id']=$user_id;
|
|
|
$map['status']=1;
|
|
|
$list=db('join')->where($map)->column('activity_id');
|
|
|
if(empty($list)){
|
|
|
$this->success('');
|
|
|
}
|
|
|
$activity_id=implode(',',$list);
|
|
|
$Clock=new ClockModel();
|
|
|
$map['user_id']=$user_id;
|
|
|
$map['activity_id']=['in',$activity_id];
|
|
|
$info=$Clock->where($map)->with(['activity'])->select();
|
|
|
$this->success('',$info);
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
* @title 开始打卡
|
|
|
* @description 开始打卡
|
|
|
* @author sgj
|
...
|
...
|
|