Explorar o código

LY 定期培训 超期和补赔

ly hai 1 ano
pai
achega
090f447fe4

+ 1 - 1
master/src/main/java/com/ruoyi/project/training/controller/TTrainingbccDeviceController.java

@@ -80,7 +80,7 @@ public class TTrainingbccDeviceController extends BaseController
 
             //如果补赔,可以
             if ("1".equals(t.getSupplementary())) {
-
+                t.setIsLock(0);
             }
         }
         return getDataTable(list);

+ 10 - 0
master/src/main/java/com/ruoyi/project/training/elearn/domain/TElPaper.java

@@ -27,6 +27,8 @@ public class TElPaper extends BaseEntity
     @Excel(name = "用户id")
     private Long userId;
 
+    private String nickName;
+
     /** 员工编号 */
     @Excel(name = "员工编号")
     private String staffId;
@@ -322,6 +324,14 @@ public class TElPaper extends BaseEntity
         return radioList;
     }
 
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
     public void setRadioList(List<TElPaperQu> radioList) {
         this.radioList = radioList;
     }

+ 3 - 0
master/src/main/java/com/ruoyi/project/training/elearn/service/impl/TElPaperServiceImpl.java

@@ -432,6 +432,9 @@ public class TElPaperServiceImpl implements ITElPaperService {
             List<TElPaperQuAnswer> list = tElPaperQuAnswerMapper.selectTElPaperQuAnswerListByPaper(a);
             item.setAnswerList(list);
         }
+        //
+        SysUser user = sysUserMapper.selectUserById( paper.getUserId());
+        paper.setNickName(user.getNickName());
         paper.setQuList(quList);
         return paper;
     }

+ 1 - 1
ui/src/views/training/elearn/paper/result.vue

@@ -7,7 +7,7 @@
     <el-row :gutter="24" style="margin-top: 50px">
 
       <el-col :span="8" class="text-center">
-        考生姓名:{{ paperData.userId_dictText }}
+        考生姓名:{{ paperData.nickName }}
       </el-col>
 
       <el-col :span="8" class="text-center">