|
@@ -21,20 +21,27 @@ class Index extends Api
|
|
public function index()
|
|
public function index()
|
|
{
|
|
{
|
|
$now = time();
|
|
$now = time();
|
|
- $papers = Db::name('exam_paper')->field('id,image,title,start_time,end_time,total_score,limit_time')
|
|
|
|
|
|
+ $papers = Db::name('exam_paper')->field('id,image,title,start_time,end_time,total_score,limit_time,user_ids')
|
|
->where('status', 'NORMAL')
|
|
->where('status', 'NORMAL')
|
|
->where('deletetime', NULL)
|
|
->where('deletetime', NULL)
|
|
// ->whereRaw("((start_time = 0 and end_time = 0) or (start_time < {$now} and end_time > {$now}))")
|
|
// ->whereRaw("((start_time = 0 and end_time = 0) or (start_time < {$now} and end_time > {$now}))")
|
|
->whereRaw("((end_time = 0) or (end_time > {$now}))")
|
|
->whereRaw("((end_time = 0) or (end_time > {$now}))")
|
|
// ->where('find_in_set(:user_ids,user_ids)', ['user_ids' => $this->auth->id])
|
|
// ->where('find_in_set(:user_ids,user_ids)', ['user_ids' => $this->auth->id])
|
|
- ->limit(3)
|
|
|
|
|
|
+ ->limit(2)
|
|
->order('start_time desc')
|
|
->order('start_time desc')
|
|
->select();
|
|
->select();
|
|
|
|
|
|
foreach($papers as $key => &$val){
|
|
foreach($papers as $key => &$val){
|
|
$val['image'] = localpath_to_netpath($val['image']);
|
|
$val['image'] = localpath_to_netpath($val['image']);
|
|
$val['limit_time'] = $val['limit_time']/60; //秒转换分种
|
|
$val['limit_time'] = $val['limit_time']/60; //秒转换分种
|
|
- $val['is_start'] = 1;
|
|
|
|
|
|
+ $val['is_start'] = 0;
|
|
|
|
+
|
|
|
|
+ if($val['start_time'] < $now && $now < $val['end_time'] && in_array($this->auth->id,explode(',',$val['user_ids'])) ){
|
|
|
|
+ $val['is_start'] = 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ unset($val['user_ids']);
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
$this->success('', $papers);
|
|
$this->success('', $papers);
|
|
@@ -53,7 +60,7 @@ class Index extends Api
|
|
->where('deletetime', NULL)
|
|
->where('deletetime', NULL)
|
|
->whereRaw("((endtime = 0) or (endtime > {$now}))")
|
|
->whereRaw("((endtime = 0) or (endtime > {$now}))")
|
|
//->where("(userauth_status = 1) or (find_in_set('".$this->auth->id."',user_ids) )")
|
|
//->where("(userauth_status = 1) or (find_in_set('".$this->auth->id."',user_ids) )")
|
|
- ->limit(3)
|
|
|
|
|
|
+ ->limit(2)
|
|
->order('starttime desc')
|
|
->order('starttime desc')
|
|
->select();
|
|
->select();
|
|
|
|
|
|
@@ -89,7 +96,6 @@ class Index extends Api
|
|
foreach($papers as $key => &$val){
|
|
foreach($papers as $key => &$val){
|
|
$val['image'] = localpath_to_netpath($val['image']);
|
|
$val['image'] = localpath_to_netpath($val['image']);
|
|
$val['limit_time'] = $val['limit_time']/60; //秒转换分种
|
|
$val['limit_time'] = $val['limit_time']/60; //秒转换分种
|
|
- $val['is_start'] = 1;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
$this->success('', $papers);
|
|
$this->success('', $papers);
|
|
@@ -137,7 +143,7 @@ class Index extends Api
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- $this->success('', $papers);
|
|
|
|
|
|
+ $this->success(1, $papers);
|
|
}
|
|
}
|
|
|
|
|
|
//在线考试
|
|
//在线考试
|