ting.yin 3 years ago
parent
commit
c7573a7aa1

+ 6 - 4
db/init.sql

@@ -55,7 +55,8 @@ CREATE TABLE `pm_exam` (
   `org_id` bigint(20) NOT NULL,
   `name` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   `enable` bigint(1) NOT NULL,
-  `groupType` varchar(255) COLLATE utf8_bin NOT NULL,
+  `group_type` varchar(255) COLLATE utf8_bin NOT NULL,
+  `check_sort` varchar(255) COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `IDX_EXAM_001` (`org_id`,`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
@@ -65,23 +66,23 @@ CREATE TABLE `pm_exam` (
 -- ----------------------------
 DROP TABLE IF EXISTS `pm_exam_student`;
 CREATE TABLE `pm_exam_student` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `create_time` datetime(6) NOT NULL,
   `creator_id` bigint(20) DEFAULT NULL,
   `update_time` datetime(6) DEFAULT NULL,
   `updater_id` bigint(20) DEFAULT NULL,
   `org_id` bigint(20) NOT NULL,
   `exam_id` bigint(20) NOT NULL,
+  `sort_no` bigint(20) NOT NULL,
   `name` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   `course_code` varchar(255) COLLATE utf8_bin NOT NULL,
   `student_code` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   `exam_number` varchar(255) COLLATE utf8_bin NOT NULL,
   `exam_site` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   `exam_room` varchar(255) COLLATE utf8_bin DEFAULT NULL,
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`exam_id`, `sort_no`),
   KEY `IDX_EXAM_STUDENT_001` (`org_id`,`exam_id`),
   KEY `IDX_EXAM_STUDENT_002` (`exam_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 
 -- ----------------------------
 --  Table structure for `pm_exam_user_relation`
@@ -133,6 +134,7 @@ CREATE TABLE `pm_user` (
   `enable` bit(1) NOT NULL,
   `password` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   `role` varchar(64) COLLATE utf8_bin NOT NULL,
+  `accessToken` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `IDX_USER_01` (`login_name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

+ 11 - 0
src/main/java/cn/com/qmth/print/manage/entity/ExamEntity.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.print.manage.entity;
 
 import cn.com.qmth.print.manage.entity.base.AuditingEntity;
+import cn.com.qmth.print.manage.enums.CheckSort;
 import cn.com.qmth.print.manage.enums.GroupType;
 
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -18,6 +19,8 @@ public class ExamEntity extends AuditingEntity {
 
     private GroupType groupType;
 
+    private CheckSort checkSort;
+
     public Long getOrgId() {
         return orgId;
     }
@@ -50,4 +53,12 @@ public class ExamEntity extends AuditingEntity {
         this.groupType = groupType;
     }
 
+    public CheckSort getCheckSort() {
+        return checkSort;
+    }
+
+    public void setCheckSort(CheckSort checkSort) {
+        this.checkSort = checkSort;
+    }
+
 }

+ 12 - 2
src/main/java/cn/com/qmth/print/manage/entity/ExamStudentEntity.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.print.manage.entity;
 
-import cn.com.qmth.print.manage.entity.base.AuditingEntity;
+import cn.com.qmth.print.manage.entity.base.AuditingWithoutIdEntity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
 @TableName("pm_exam_student")
-public class ExamStudentEntity extends AuditingEntity {
+public class ExamStudentEntity extends AuditingWithoutIdEntity {
 
     private static final long serialVersionUID = -5806987133695004969L;
 
@@ -13,6 +13,8 @@ public class ExamStudentEntity extends AuditingEntity {
 
     private Long examId;
 
+    private Long sortNo;
+
     private String courseCode;
 
     private String name;
@@ -95,4 +97,12 @@ public class ExamStudentEntity extends AuditingEntity {
         this.examRoom = examRoom;
     }
 
+    public Long getSortNo() {
+        return sortNo;
+    }
+
+    public void setSortNo(Long sortNo) {
+        this.sortNo = sortNo;
+    }
+
 }

+ 43 - 0
src/main/java/cn/com/qmth/print/manage/enums/CheckSort.java

@@ -0,0 +1,43 @@
+package cn.com.qmth.print.manage.enums;
+
+public enum CheckSort {
+
+    ASC("正序", 1L),
+
+    DESC("逆序", 2L);
+
+    private String name;
+
+    private Long id;
+
+    CheckSort(String name) {
+        this.name = name;
+    }
+
+    private CheckSort(String name, Long id) {
+        this.name = name;
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public static CheckSort getByName(String name) {
+        for (CheckSort r : CheckSort.values()) {
+            if (r.getName().equals(name)) {
+                return r;
+            }
+        }
+        return null;
+    }
+
+}

+ 2 - 2
src/main/java/cn/com/qmth/print/manage/enums/RoleMeta.java

@@ -2,9 +2,9 @@ package cn.com.qmth.print.manage.enums;
 
 public enum RoleMeta {
 
-    SUPER_ADMIN("管理员", 1L),
+    ADMIN("管理员", 1L),
 
-    PRINT_ADMIN("校验员", 2L);
+    CHECKER("校验员", 2L);
 
     /**
      * 角色名