|
@@ -159,7 +159,7 @@ class Trainactive extends Backend
|
|
|
//全部应到用户,左外链接,没签到的则为NULL
|
|
|
if(empty($info['user_ids'])){ $info['user_ids'] = 0;}
|
|
|
|
|
|
- $user_yingdao = Db::name('user')->field('user_train.*,user.nickname')
|
|
|
+ $user_yingdao = Db::name('user')->field('user_train.*,user.nickname,user.id as user_pkid')
|
|
|
->join('user_train','user_train.user_id = user.id and user_train.train_id = '.$info['id'],'LEFT')
|
|
|
->where('user.id','IN',$info['user_ids'])
|
|
|
->orderRaw('field(user.id,'.$info['user_ids'].')')
|
|
@@ -183,7 +183,7 @@ class Trainactive extends Backend
|
|
|
}
|
|
|
|
|
|
//其他用户 签到记录
|
|
|
- $user_train = Db::name('user_train')->field('user_train.*,user.nickname')
|
|
|
+ $user_train = Db::name('user_train')->field('user_train.*,user.nickname,user.id as user_pkid')
|
|
|
->join('user','user_train.user_id = user.id','LEFT')
|
|
|
->where('user_train.train_id',$id)
|
|
|
->where('user_train.user_id','NOTIN',$info['user_ids'])
|
|
@@ -198,8 +198,14 @@ class Trainactive extends Backend
|
|
|
$user_train[$key]['status_color'] = '';
|
|
|
}
|
|
|
|
|
|
+ //本活动给的所有评分
|
|
|
+ $user_train_evaluate = Db::name('user_train_evaluate')->where('train_id',$id)->column('user_id,score');
|
|
|
+
|
|
|
//合并
|
|
|
$all_user_train = array_merge($user_yingdao,$user_train);
|
|
|
+ foreach($all_user_train as $key => $usertrain){
|
|
|
+ $all_user_train[$key]['score'] = isset($user_train_evaluate[$usertrain['user_pkid']]) ? $user_train_evaluate[$usertrain['user_pkid']] : '';
|
|
|
+ }
|
|
|
$this->assign('user_train',$all_user_train);
|
|
|
|
|
|
//学习记录,过滤掉没签到的
|