潘钊 / bsth_control · Commits

Commit 32f3be1e79c1399cfac28d8cd57d44f26f788195

Authored by ljq
1 parent 89dead75
build: skipped

1

Inline Side-by-side
Showing 6 changed files with 27 additions and 7 deletions
src/main/java/com/bsth/entity/subject/Subject.java
  View file @32f3be1
... ... @@ -21,6 +21,8 @@ public class Subject {
21 21 private String dir;
22 22 //应对答案
23 23 private String answer;
  24 + //学生操作
  25 + private String reason;
24 26  
25 27 private String schStatus;
26 28  
... ... @@ -88,4 +90,12 @@ public class Subject {
88 90 public void setSchStatus(String schStatus) {
89 91 this.schStatus = schStatus;
90 92 }
  93 +
  94 + public String getReason() {
  95 + return reason;
  96 + }
  97 +
  98 + public void setReason(String reason) {
  99 + this.reason = reason;
  100 + }
91 101 }
... ...
src/main/java/com/bsth/entity/subject/SubjectUser.java
  View file @32f3be1
1 1 package com.bsth.entity.subject;
2 2  
  3 +import com.bsth.entity.sys.SysUser;
  4 +
3 5 import javax.persistence.*;
4   -import java.io.Serializable;
5 6 import java.util.Date;
6 7  
7 8 @Entity
... ... @@ -13,7 +14,8 @@ public class SubjectUser {
13 14 private Integer id;
14 15  
15 16 //用户Id
16   - private Integer userId;
  17 + @ManyToOne
  18 + private SysUser userId;
17 19 //日期
18 20 private String rq;
19 21 //对或错 0/1
... ... @@ -56,11 +58,12 @@ public class SubjectUser {
56 58 this.subjectId = subjectId;
57 59 }
58 60  
59   - public Integer getUserId() {
  61 +
  62 + public SysUser getUserId() {
60 63 return userId;
61 64 }
62 65  
63   - public void setUserId(Integer userId) {
  66 + public void setUserId(SysUser userId) {
64 67 this.userId = userId;
65 68 }
66 69  
... ...
src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
  View file @32f3be1
... ... @@ -31,6 +31,6 @@ public interface SubjectUserRepository extends BaseRepository<SubjectUser, Integ
31 31 List<Object[]> searchSubjectUserDetail(String rq, String userId);
32 32  
33 33 @Modifying
34   - @Query(value = "delete from SubjectUser s where s.rq=?1 and s.userId in ( ?2 )")
  34 + @Query(value = "delete from SubjectUser s where s.rq=?1 and s.userId.id in ( ?2 )")
35 35 void deleteSubjectUserByUserIds(String date, List<Integer> userIds);
36 36 }
... ...
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
  View file @32f3be1
... ... @@ -244,7 +244,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
244 244 ddexamService.clearScheduleRealInfo(user);
245 245 for (String s : arr) {
246 246 SubjectUser subjectUser=new SubjectUser();
247   - subjectUser.setUserId(user.getId());
  247 + subjectUser.setUserId(user);
248 248 subjectUser.setRq(rq);
249 249 subjectUser.setCreateBy(loginUser.getId());
250 250 Subject subject=new Subject();
... ...
src/main/resources/static/pages/ddexam/list.html
  View file @32f3be1
... ... @@ -34,6 +34,7 @@
34 34 <td>考生账号</td>
35 35 <td>考生名称</td>
36 36 <td>考生们密码</td>
  37 + <td>班级</td>
37 38 <td>考生状态</td>
38 39 </tr>
39 40 </thead>
... ... @@ -71,6 +72,7 @@
71 72 <td>{{obj.userName}}</td>
72 73 <td>{{obj.name}}</td>
73 74 <td>123456</td>
  75 + <td>{{obj.className}}</td>
74 76 <td>
75 77 {{if obj.ksstatus=="1"}}已初始化{{else}}未初始化{{/if}}
76 78 </td>
... ...
src/main/resources/static/real_control_v2/main.html
  View file @32f3be1
... ... @@ -79,11 +79,16 @@
79 79 <div class="north-tm">
80 80 当前第 {{index}} 题 &nbsp;&nbsp;共有 {{number}} 题
81 81 </div>
  82 +
  83 +
82 84 <div class="north-tm">
83 85 场景：{{subjectId.subjectText}}
84 86 </div>
  87 + <div class="north-tm">
  88 + 操作：{{subjectId.reason}}
  89 + </div>
85 90 <div class="north-tmx">
86   - 操作：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
  91 + 答案：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
87 92 </div>
88 93 <div class="north-button">
89 94 <button id="submit" class="subject_button" data-id="{{id}}">提交</button>
... ...