|
@@ -194,8 +194,15 @@ class Trainactive extends Backend
|
|
//合并
|
|
//合并
|
|
$all_user_train = array_merge($user_yingdao,$user_train);
|
|
$all_user_train = array_merge($user_yingdao,$user_train);
|
|
$this->assign('user_train',$all_user_train);
|
|
$this->assign('user_train',$all_user_train);
|
|
- $this->assign('user_train_chunk',array_chunk($all_user_train,8));
|
|
|
|
|
|
|
|
|
|
+ //学习记录,过滤掉没签到的
|
|
|
|
+ $all_user_train_signed = $all_user_train;
|
|
|
|
+ foreach($all_user_train_signed as $key => $val){
|
|
|
|
+ if(empty($val['sign_image'])){
|
|
|
|
+ unset($all_user_train_signed[$key]);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ $this->assign('user_train_chunk',array_chunk($all_user_train_signed,8));
|
|
|
|
|
|
//应到,但实到的
|
|
//应到,但实到的
|
|
$shidao = Db::name('user_train')->where('train_id',$id)->where('user_id','IN',$info['user_ids'])->count('id');
|
|
$shidao = Db::name('user_train')->where('train_id',$id)->where('user_id','IN',$info['user_ids'])->count('id');
|