瀏覽代碼

字段修改

wangliang 4 年之前
父節點
當前提交
f5d21a3b39

+ 18 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamStudentDto.java

@@ -23,6 +23,24 @@ public class TEExamStudentDto implements Serializable {
     private String roomName;//考场名称
     private String grade;//年级
     private String classNo;//教学班级
+    private Long activityId;//场次id
+    private String activityCode;//场次代码
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getActivityCode() {
+        return activityCode;
+    }
+
+    public void setActivityCode(String activityCode) {
+        this.activityCode = activityCode;
+    }
 
     public Long getId() {
         return id;

+ 0 - 2
themis-business/src/main/resources/db/init.sql

@@ -451,7 +451,6 @@ INSERT INTO `t_b_privilege` VALUES (57, '查询监考信息', '/api/admin/invigi
 INSERT INTO `t_b_privilege` VALUES (58, '导入监考信息', '/api/admin/invigilateUser/import', 'LINK', 9, 2, NULL, '2020-08-01 12:08:31');
 INSERT INTO `t_b_privilege` VALUES (59, '修改监考信息', '/api/admin/invigilateUser/save', 'LINK', 9, 3, NULL, '2020-08-01 12:08:31');
 INSERT INTO `t_b_privilege` VALUES (60, '考生端', 'oeManager', 'MENU', NULL, 1, NULL, '2020-08-01 12:08:31');
-INSERT INTO `t_b_privilege` VALUES (61, '验证考试口令', '/api/oe/exam/short_code', 'LINK', 60, 1, NULL, '2020-08-01 12:08:31');
 INSERT INTO `t_b_privilege` VALUES (62, '获取待考列表', '/api/oe/exam/waiting', 'LINK', 60, 2, NULL, '2020-08-01 12:08:31');
 INSERT INTO `t_b_privilege` VALUES (63, '开始候考', '/api/oe/exam/prepare', 'LINK', 60, 3, NULL, '2020-08-01 12:08:31');
 INSERT INTO `t_b_privilege` VALUES (64, '断点恢复', '/api/oe/exam/resume', 'LINK', 60, 4, NULL, '2020-08-01 12:08:31');
@@ -568,7 +567,6 @@ INSERT INTO `t_b_role_privilege` VALUES (45, 'ADMIN', 57);
 INSERT INTO `t_b_role_privilege` VALUES (46, 'ADMIN', 58);
 INSERT INTO `t_b_role_privilege` VALUES (47, 'ADMIN', 59);
 INSERT INTO `t_b_role_privilege` VALUES (48, 'STUDENT', 60);
-INSERT INTO `t_b_role_privilege` VALUES (49, 'STUDENT', 61);
 INSERT INTO `t_b_role_privilege` VALUES (50, 'STUDENT', 62);
 INSERT INTO `t_b_role_privilege` VALUES (51, 'STUDENT', 63);
 INSERT INTO `t_b_role_privilege` VALUES (52, 'STUDENT', 64);

+ 3 - 1
themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -15,7 +15,9 @@
             tees.room_code as roomCode,
             tees.room_name as roomName,
             tees.grade,
-            tees.class_no as classNo
+            tees.class_no as classNo,
+            teea.id as activityId,
+            teea.code as activityCode
         from
             t_e_exam_student tees
         left join t_e_exam tee on

+ 1 - 1
themis-exam/src/main/resources/application.properties

@@ -146,5 +146,5 @@ spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/MET
 prefix.url.exam=api/oe
 
 #\u65E0\u9700\u9274\u6743\u7684url
-no.auth.urls=/webjars/**,/druid/**,/swagger-ui.html,/doc.html,/swagger-resources/**,/v2/api-docs,/webjars/springfox-swagger-ui/**,/api/oe/student/login,/api/oe/sys/env,/file/**,/upload/**,/client/**,/base_photo/**,/frontend/**,/api/oe/monitor/live_url,/api/oe/monitor/call/apply,/api/oe/monitor/call/cancel,/api/oe/monitor/call/list,/api/oe/monitor/call/query
+no.auth.urls=/webjars/**,/druid/**,/swagger-ui.html,/doc.html,/swagger-resources/**,/v2/api-docs,/webjars/springfox-swagger-ui/**,/api/oe/student/login,/api/oe/sys/env,/file/**,/upload/**,/client/**,/base_photo/**,/frontend/**,/api/oe/exam/short_code,/api/oe/monitor/live_url,/api/oe/monitor/call/apply,/api/oe/monitor/call/cancel,/api/oe/monitor/call/list,/api/oe/monitor/call/query
 common.system.urls=/api/oe/student/logout,/api/oe/exam/file/upload