1

ljq
1 parent 89dead75
Showing 6 changed files with 27 additions and 7 deletions
src/main/java/com/bsth/entity/subject/Subject.java
src/main/java/com/bsth/entity/subject/SubjectUser.java
src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
src/main/resources/static/pages/ddexam/list.html
src/main/resources/static/real_control_v2/main.html
@@ -21,6 +21,8 @@ public class Subject {
     private String dir;
     //应对答案
     private String answer;
+    //学生操作
+    private String reason;
     private String schStatus;
@@ -88,4 +90,12 @@ public class Subject {
     public void setSchStatus(String schStatus) {
         this.schStatus = schStatus;
     }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
 }
 package com.bsth.entity.subject;
+import com.bsth.entity.sys.SysUser;
+
 import javax.persistence.*;
-import java.io.Serializable;
 import java.util.Date;
 @Entity
@@ -13,7 +14,8 @@ public class SubjectUser {
     private Integer id;
     //用户Id
-    private Integer userId;
+    @ManyToOne
+    private SysUser userId;
     //日期
     private String rq;
     //对或错 0/1
@@ -56,11 +58,12 @@ public class SubjectUser {
         this.subjectId = subjectId;
     }
-    public Integer getUserId() {
+
+    public SysUser getUserId() {
         return userId;
     }
-    public void setUserId(Integer userId) {
+    public void setUserId(SysUser userId) {
         this.userId = userId;
     }
@@ -31,6 +31,6 @@ public interface SubjectUserRepository extends BaseRepository&lt;SubjectUser, Integ
     List<Object[]> searchSubjectUserDetail(String rq, String userId);
     @Modifying
-    @Query(value = "delete from SubjectUser s where s.rq=?1 and s.userId in ( ?2 )")
+    @Query(value = "delete from SubjectUser s where s.rq=?1 and s.userId.id in ( ?2 )")
     void deleteSubjectUserByUserIds(String date, List<Integer> userIds);
 }
@@ -244,7 +244,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
             ddexamService.clearScheduleRealInfo(user);
             for (String s : arr) {
                 SubjectUser subjectUser=new SubjectUser();
-                subjectUser.setUserId(user.getId());
+                subjectUser.setUserId(user);
                 subjectUser.setRq(rq);
                 subjectUser.setCreateBy(loginUser.getId());
                 Subject subject=new Subject();
@@ -34,6 +34,7 @@
                             <td>考生账号</td>
                             <td>考生名称</td>
                             <td>考生们密码</td>
+                            <td>班级</td>
                             <td>考生状态</td>
                         </tr>
                         </thead>
@@ -71,6 +72,7 @@
         <td>{{obj.userName}}</td>
         <td>{{obj.name}}</td>
         <td>123456</td>
+        <td>{{obj.className}}</td>
         <td>
         {{if obj.ksstatus=="1"}}已初始化{{else}}未初始化{{/if}}
         </td>
@@ -79,11 +79,16 @@
         <div class="north-tm">
             当前第 {{index}} 题  &nbsp;&nbsp;共有 {{number}} 题
         </div>
+        
+        
         <div class="north-tm">
             场景：{{subjectId.subjectText}}
         </div>
+        <div class="north-tm">
+            操作：{{subjectId.reason}}
+        </div>
         <div class="north-tmx">
-            操作：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
+            答案：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
         </div>
         <div class="north-button">
             <button id="submit" class="subject_button" data-id="{{id}}">提交</button>