瀏覽代碼

打印,签到详情,增加一列评分

lizhen_gitee 4 月之前
父節點
當前提交
795c5b6f28
共有 2 個文件被更改,包括 16 次插入8 次删除
  1. 8 2
      application/admin/controller/Trainactive.php
  2. 8 6
      application/admin/view/trainactive/showinfo.html

+ 8 - 2
application/admin/controller/Trainactive.php

@@ -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);
 
         //学习记录,过滤掉没签到的

+ 8 - 6
application/admin/view/trainactive/showinfo.html

@@ -148,8 +148,8 @@
 
 <table id="left_table" class="table table-striped table-bordered table-hover table-nowrap">
     <tr>
-        <td colspan="5">学习情况</td>
-        <td colspan="3">应到{$result.yingdao}人,实到{$result.shidao}人,未到{$result.weidao}人,其他{$result.qita}人</td>
+        <td colspan="4">学习情况</td>
+        <td colspan="4">应到{$result.yingdao}人,实到{$result.shidao}人,未到{$result.weidao}人,其他{$result.qita}人</td>
     </tr>
     {volist name="$user_train_chunk" id="chunk"}
     <tr>
@@ -164,18 +164,19 @@
 
 <table id="right_table" style="display: none" class="table table-striped table-bordered table-hover table-nowrap" width="100%">
     <tr>
-        <td colspan="5">学习情况</td>
-        <td colspan="3">应到{$result.yingdao}人,实到{$result.shidao}人,未到{$result.weidao}人,其他{$result.qita}人</td>
+        <td colspan="4">学习情况</td>
+        <td colspan="4">应到{$result.yingdao}人,实到{$result.shidao}人,未到{$result.weidao}人,其他{$result.qita}人</td>
     </tr>
     <tr>
-        <td colspan="5">参与人</td>
+        <td colspan="4">参与人</td>
         <td colspan="2">学习时间</td>
         <td>状态</td>
+        <td>评分</td>
     </tr>
     {volist name="$user_train" id="vo"}
     <tr>
         <td colspan="2">{$vo.nickname}</td>
-        <td colspan="3">
+        <td colspan="2">
             <?php if(!empty($vo['sign_image'])){ ?>
                 <img src="{$vo.sign_image}" width="90px" height="50px">
             <?php }else{ ?>
@@ -184,6 +185,7 @@
         </td>
         <td colspan="2">{$vo.sign_time}</td>
         <td><font color="{$vo.status_color}">{$vo.status_text}</font></td>
+        <td>{$vo.score}</td>
     </tr>
     {/volist}
 </table>