bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ClientStatus.java

@@ -0,0 +1,120 @@
+package com.qmth.distributed.print.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.base.BaseEntity;
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
+import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 机器打样状态表
+ * </p>
+ *
+ * @author xf
+ * @since 2021-03-23
+ */
+@TableName("client_status")
+public class ClientStatus extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    /**
+     * 机器唯一码
+     */
+    @TableField("machine_code")
+    private String machineCode;
+    /**
+     * 考场ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("exam_detail_id")
+    private Long examDetailId;
+    /**
+     * 是否打样
+     */
+    @TableField("is_try")
+    private Boolean isTry;
+    /**
+     * 打样时间
+     */
+    @TableField("try_time")
+    private Long tryTime;
+    /**
+     * 是否合格
+     */
+    @TableField("is_pass")
+    private Boolean isPass;
+
+    /**
+     * 是否缓存
+     */
+    @TableField("is_download")
+    private Boolean isDownload;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getMachineCode() {
+        return machineCode;
+    }
+
+    public void setMachineCode(String machineCode) {
+        this.machineCode = machineCode;
+    }
+
+    public Long getExamDetailId() {
+        return examDetailId;
+    }
+
+    public void setExamDetailId(Long examDetailId) {
+        this.examDetailId = examDetailId;
+    }
+
+    public Boolean getTry() {
+        return isTry;
+    }
+
+    public void setTry(Boolean aTry) {
+        isTry = aTry;
+    }
+
+    public Long getTryTime() {
+        return tryTime;
+    }
+
+    public void setTryTime(Long tryTime) {
+        this.tryTime = tryTime;
+    }
+
+    public Boolean getPass() {
+        return isPass;
+    }
+
+    public void setPass(Boolean pass) {
+        isPass = pass;
+    }
+
+    public Boolean getDownload() {
+        return isDownload;
+    }
+
+    public void setDownload(Boolean download) {
+        isDownload = download;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTask.java

@@ -89,16 +89,6 @@ public class ExamTask extends BaseEntity implements Serializable {
      */
     private Boolean enable;
 
-    @TableField("is_try")
-    private Boolean isTry;
-
-    @TableField("try_time")
-    private Long tryTime;
-
-    @TableField("is_pass")
-    private Boolean isPass;
-
-
     @TableField("batch_no")
     private String batchNo;
 
@@ -209,30 +199,6 @@ public class ExamTask extends BaseEntity implements Serializable {
         this.enable = enable;
     }
 
-    public Boolean getTry() {
-        return isTry;
-    }
-
-    public void setTry(Boolean aTry) {
-        isTry = aTry;
-    }
-
-    public Long getTryTime() {
-        return tryTime;
-    }
-
-    public void setTryTime(Long tryTime) {
-        this.tryTime = tryTime;
-    }
-
-    public Boolean getPass() {
-        return isPass;
-    }
-
-    public void setPass(Boolean pass) {
-        isPass = pass;
-    }
-
     public String getBatchNo() {
         return batchNo;
     }

distributed-print-business/src/main/resources/db/init-table.sql

@@ -188,6 +188,26 @@ CREATE TABLE `basic_verify_code`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '短信验证码记录表' ROW_FORMAT = Dynamic;
 
+-- ----------------------------
+-- Table structure for client_status
+-- ----------------------------
+DROP TABLE IF EXISTS `client_status`;
+CREATE TABLE `client_status`  (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `school_id` bigint(20) NULL DEFAULT NULL,
+  `machine_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '机器唯一码',
+  `exam_detail_id` bigint(20) NOT NULL COMMENT '考场ID',
+  `is_try` tinyint(1) NULL DEFAULT NULL COMMENT '是否打样：true-是，false-否',
+  `try_time` bigint(20) NULL DEFAULT NULL COMMENT '打样时间',
+  `is_pass` tinyint(1) NULL DEFAULT NULL COMMENT '是否合格：true-合格，false-不合格',
+  `is_download` tinyint(1) NULL DEFAULT NULL COMMENT '是否缓存：true-是，false-否',
+  `create_id` bigint(20) NULL DEFAULT NULL,
+  `create_time` bigint(20) NULL DEFAULT NULL,
+  `update_id` bigint(20) NULL DEFAULT NULL,
+  `update_time` bigint(20) NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '机器打样记录' ROW_FORMAT = Dynamic;
+
 -- ----------------------------
 -- Table structure for exam_card
 -- ----------------------------
@@ -247,7 +267,7 @@ CREATE TABLE `exam_detail`  (
   `pages_a3` int(2) NULL DEFAULT NULL COMMENT 'A3印量小计（页）',
   `pages_a4` int(2) NULL DEFAULT NULL COMMENT 'A4印量小计（页）',
   `status` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '状态：NEW: \"新建\",READY: \"就绪\",WAITING: \"待印刷\",PRINTING: \"印刷中\",FINISH: \"已完成\"',
-  `validate` tinyint(1) NULL DEFAULT 0 COMMENT '是否校验',
+  `validate` tinyint(1) NULL DEFAULT 0 COMMENT '是否校验：true-是，false-否',
   `print_start_time` bigint(20) NULL DEFAULT NULL COMMENT '打印开始时间',
   `print_end_time` bigint(20) NULL DEFAULT NULL COMMENT '打印完成时间',
   `attachment_id` bigint(20) NULL DEFAULT NULL COMMENT '附件id',
@@ -344,9 +364,6 @@ CREATE TABLE `exam_task`  (
   `review` tinyint(4) NULL DEFAULT NULL COMMENT '0-禁用，1-启用',
   `review_status` varchar(8) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '审核状态：PASS-审核通过，NOT_PASS-审核不通过，默认为空-未审核',
   `enable` tinyint(4) NULL DEFAULT 1 COMMENT '是否启用，false：停用，true：启用',
-  `is_try` TINYINT(1) NULL COMMENT '是否打样：true-是，false-否',
-  `try_time` BIGINT(20) NULL COMMENT '试打时间',
-  `is_pass` TINYINT(1) NULL COMMENT '是否合格：true-合格，false-不合格',
   `batch_no` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `create_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
   `create_time` bigint(20) NULL DEFAULT NULL COMMENT '创建时间',