3.3.0 update

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/MarkPaper.java

@@ -22,7 +22,7 @@ public class MarkPaper implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "课程代码")
     private String courseCode;
@@ -69,11 +69,11 @@ public class MarkPaper implements Serializable {
     @ApiModelProperty(value = "评卷是否跳转")
     private Boolean autoScroll;
 
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getCourseCode() {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/MarkQuestion.java

@@ -23,10 +23,10 @@ public class MarkQuestion implements Serializable {
 
     @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "试卷类型")
     private String paperNumber;
@@ -63,18 +63,18 @@ public class MarkQuestion implements Serializable {
 
     private String name;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/MarkStudent.java

@@ -1,13 +1,13 @@
 package com.qmth.teachcloud.common.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 考试考生库
@@ -24,10 +24,10 @@ public class MarkStudent implements Serializable {
 
     @ApiModelProperty(value = "主键(和exam_student表id一样)")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "科目代码")
     private String courseCode;
@@ -81,13 +81,13 @@ public class MarkStudent implements Serializable {
     private Integer isBreach;
 
     @ApiModelProperty(value = "上传时间")
-    private LocalDateTime uploadTime;
+    private Long uploadTime;
 
     @ApiModelProperty(value = "复核时间")
-    private LocalDateTime inspectTime;
+    private Long inspectTime;
 
     @ApiModelProperty(value = "复核人ID")
-    private Integer inspectorId;
+    private Long inspectorId;
 
     @ApiModelProperty(value = "客观总分")
     private Double objectiveScore;
@@ -126,18 +126,20 @@ public class MarkStudent implements Serializable {
 
     private String breachCode;
 
-    public Integer getId() {
+    private Boolean omrAbsent;
+
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getCourseCode() {
@@ -259,25 +261,25 @@ public class MarkStudent implements Serializable {
     public void setIsBreach(Integer isBreach) {
         this.isBreach = isBreach;
     }
-    public LocalDateTime getUploadTime() {
+    public Long getUploadTime() {
         return uploadTime;
     }
 
-    public void setUploadTime(LocalDateTime uploadTime) {
+    public void setUploadTime(Long uploadTime) {
         this.uploadTime = uploadTime;
     }
-    public LocalDateTime getInspectTime() {
+    public Long getInspectTime() {
         return inspectTime;
     }
 
-    public void setInspectTime(LocalDateTime inspectTime) {
+    public void setInspectTime(Long inspectTime) {
         this.inspectTime = inspectTime;
     }
-    public Integer getInspectorId() {
+    public Long getInspectorId() {
         return inspectorId;
     }
 
-    public void setInspectorId(Integer inspectorId) {
+    public void setInspectorId(Long inspectorId) {
         this.inspectorId = inspectorId;
     }
     public Double getObjectiveScore() {
@@ -379,6 +381,14 @@ public class MarkStudent implements Serializable {
         this.breachCode = breachCode;
     }
 
+    public Boolean getOmrAbsent() {
+        return omrAbsent;
+    }
+
+    public void setOmrAbsent(Boolean omrAbsent) {
+        this.omrAbsent = omrAbsent;
+    }
+
     @Override
     public String toString() {
         return "MarkStudent{" +
@@ -418,6 +428,7 @@ public class MarkStudent implements Serializable {
             ", absentSuspect=" + absentSuspect +
             ", incomplete=" + incomplete +
             ", breachCode=" + breachCode +
+            ", omrAbsent=" + omrAbsent +
         "}";
     }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/ScanAnswerCard.java

@@ -1,13 +1,13 @@
 package com.qmth.teachcloud.common.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 题卡卡格式表
@@ -24,7 +24,7 @@ public class ScanAnswerCard implements Serializable {
 
     @ApiModelProperty(value = "考试ID")
     @TableId(value = "exam_id", type = IdType.AUTO)
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "科目代码")
     private String paperNumber;
@@ -48,7 +48,7 @@ public class ScanAnswerCard implements Serializable {
     private String remark;
 
     @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
+    private Long updateTime;
 
     @ApiModelProperty(value = "是否需要适配")
     private Integer needAdapte;
@@ -71,11 +71,11 @@ public class ScanAnswerCard implements Serializable {
 
     private String adapteUri;
 
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {
@@ -127,11 +127,11 @@ public class ScanAnswerCard implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
-    public LocalDateTime getUpdateTime() {
+    public Long getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(LocalDateTime updateTime) {
+    public void setUpdateTime(Long updateTime) {
         this.updateTime = updateTime;
     }
     public Integer getNeedAdapte() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkArbitrateHistory.java

@@ -1,13 +1,13 @@
 package com.qmth.teachcloud.mark.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 仲裁记录表
@@ -24,10 +24,10 @@ public class MarkArbitrateHistory implements Serializable {
 
     @ApiModelProperty(value = "自增主键")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
@@ -42,13 +42,13 @@ public class MarkArbitrateHistory implements Serializable {
     private String secretNumber;
 
     @ApiModelProperty(value = "考生ID")
-    private Integer studentId;
+    private Long studentId;
 
     @ApiModelProperty(value = "状态")
     private String status;
 
     @ApiModelProperty(value = "处理人ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value = "总分")
     private Double totalScore;
@@ -57,23 +57,23 @@ public class MarkArbitrateHistory implements Serializable {
     private String scoreList;
 
     @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
+    private Long createTime;
 
     @ApiModelProperty(value = "处理时间")
-    private LocalDateTime updateTime;
+    private Long updateTime;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {
@@ -104,11 +104,11 @@ public class MarkArbitrateHistory implements Serializable {
     public void setSecretNumber(String secretNumber) {
         this.secretNumber = secretNumber;
     }
-    public Integer getStudentId() {
+    public Long getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(Integer studentId) {
+    public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
     public String getStatus() {
@@ -118,11 +118,11 @@ public class MarkArbitrateHistory implements Serializable {
     public void setStatus(String status) {
         this.status = status;
     }
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
     public Double getTotalScore() {
@@ -139,18 +139,18 @@ public class MarkArbitrateHistory implements Serializable {
     public void setScoreList(String scoreList) {
         this.scoreList = scoreList;
     }
-    public LocalDateTime getCreateTime() {
+    public Long getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(LocalDateTime createTime) {
+    public void setCreateTime(Long createTime) {
         this.createTime = createTime;
     }
-    public LocalDateTime getUpdateTime() {
+    public Long getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(LocalDateTime updateTime) {
+    public void setUpdateTime(Long updateTime) {
         this.updateTime = updateTime;
     }
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkGroup.java

@@ -23,7 +23,13 @@ public class MarkGroup implements Serializable {
 
     @ApiModelProperty(value = "考试ID")
     @TableId(value = "exam_id", type = IdType.AUTO)
-    private Integer examId;
+    private Long examId;
+
+    @ApiModelProperty(value = "课程代码")
+    private String courseCode;
+
+    @ApiModelProperty(value = "课程名称")
+    private String courseName;
 
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
@@ -55,13 +61,30 @@ public class MarkGroup implements Serializable {
     @ApiModelProperty(value = "剩余数量")
     private Integer leftCount;
 
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
     public String getPaperNumber() {
         return paperNumber;
     }
@@ -137,6 +160,7 @@ public class MarkGroup implements Serializable {
     public String toString() {
         return "MarkGroup{" +
             "examId=" + examId +
+            ", courseCode=" + courseCode +
             ", paperNumber=" + paperNumber +
             ", number=" + number +
             ", picList=" + picList +

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkGroupStudent.java

@@ -23,13 +23,13 @@ public class MarkGroupStudent implements Serializable {
 
     @ApiModelProperty(value = "考生ID")
     @TableId(value = "student_id", type = IdType.AUTO)
-    private Integer studentId;
+    private Long studentId;
 
     @ApiModelProperty(value = "分组ID")
     private Integer groupNumber;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "科目代码")
     private String paperNumber;
@@ -37,11 +37,11 @@ public class MarkGroupStudent implements Serializable {
     @ApiModelProperty(value = "状态")
     private String status;
 
-    public Integer getStudentId() {
+    public Long getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(Integer studentId) {
+    public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
     public Integer getGroupNumber() {
@@ -51,11 +51,11 @@ public class MarkGroupStudent implements Serializable {
     public void setGroupNumber(Integer groupNumber) {
         this.groupNumber = groupNumber;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkHeaderSubjectiveScore.java

@@ -23,7 +23,7 @@ public class MarkHeaderSubjectiveScore implements Serializable {
 
     @ApiModelProperty(value = "考生ID")
     @TableId(value = "student_id", type = IdType.AUTO)
-    private Integer studentId;
+    private Long studentId;
 
     @ApiModelProperty(value = "大题号")
     private Integer mainNumber;
@@ -32,7 +32,7 @@ public class MarkHeaderSubjectiveScore implements Serializable {
     private String subNumber;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "课程代码")
     private String paperNumber;
@@ -55,11 +55,11 @@ public class MarkHeaderSubjectiveScore implements Serializable {
     @ApiModelProperty(value = "科组长ID")
     private Long userId;
 
-    public Integer getStudentId() {
+    public Long getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(Integer studentId) {
+    public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
     public Integer getMainNumber() {
@@ -76,11 +76,11 @@ public class MarkHeaderSubjectiveScore implements Serializable {
     public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkHeaderTrack.java

@@ -23,7 +23,7 @@ public class MarkHeaderTrack implements Serializable {
 
     @ApiModelProperty(value = "考生ID")
     @TableId(value = "student_id", type = IdType.AUTO)
-    private Integer studentId;
+    private Long studentId;
 
     @ApiModelProperty(value = "完整题号")
     private String questionNumber;
@@ -32,7 +32,7 @@ public class MarkHeaderTrack implements Serializable {
     private Integer number;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "科目代码")
     private String paperNumber;
@@ -41,7 +41,7 @@ public class MarkHeaderTrack implements Serializable {
     private Integer groupNumber;
 
     @ApiModelProperty(value = "用户ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value = "给分")
     private Double score;
@@ -61,11 +61,11 @@ public class MarkHeaderTrack implements Serializable {
     @ApiModelProperty(value = "裁切图Y轴坐标")
     private Integer offsetY;
 
-    public Integer getStudentId() {
+    public Long getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(Integer studentId) {
+    public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
     public String getQuestionNumber() {
@@ -82,11 +82,11 @@ public class MarkHeaderTrack implements Serializable {
     public void setNumber(Integer number) {
         this.number = number;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {
@@ -103,11 +103,11 @@ public class MarkHeaderTrack implements Serializable {
     public void setGroupNumber(Integer groupNumber) {
         this.groupNumber = groupNumber;
     }
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
     public Double getScore() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkProblemHistory.java

@@ -1,13 +1,13 @@
 package com.qmth.teachcloud.mark.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 问题卷历史表
@@ -24,10 +24,10 @@ public class MarkProblemHistory implements Serializable {
 
     @ApiModelProperty(value = "自增主键")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
@@ -45,44 +45,44 @@ public class MarkProblemHistory implements Serializable {
     private String type;
 
     @ApiModelProperty(value = "考生ID")
-    private Integer studentId;
+    private Long studentId;
 
     @ApiModelProperty(value = "评卷任务ID")
-    private Integer taskId;
+    private Long taskId;
 
     @ApiModelProperty(value = "状态")
     private String status;
 
     @ApiModelProperty(value = "处理人ID")
-    private Integer updateUserId;
+    private Long updateUserId;
 
     @ApiModelProperty(value = "评卷员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value = "给分明细")
     private String scoreList;
 
     @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createTime;
+    private Long createTime;
 
     @ApiModelProperty(value = "处理时间")
-    private LocalDateTime updateTime;
+    private Long updateTime;
 
     @ApiModelProperty(value = "问题原因")
     private String remark;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {
@@ -120,18 +120,18 @@ public class MarkProblemHistory implements Serializable {
     public void setType(String type) {
         this.type = type;
     }
-    public Integer getStudentId() {
+    public Long getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(Integer studentId) {
+    public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
-    public Integer getTaskId() {
+    public Long getTaskId() {
         return taskId;
     }
 
-    public void setTaskId(Integer taskId) {
+    public void setTaskId(Long taskId) {
         this.taskId = taskId;
     }
     public String getStatus() {
@@ -141,18 +141,18 @@ public class MarkProblemHistory implements Serializable {
     public void setStatus(String status) {
         this.status = status;
     }
-    public Integer getUpdateUserId() {
+    public Long getUpdateUserId() {
         return updateUserId;
     }
 
-    public void setUpdateUserId(Integer updateUserId) {
+    public void setUpdateUserId(Long updateUserId) {
         this.updateUserId = updateUserId;
     }
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
     public String getScoreList() {
@@ -162,18 +162,18 @@ public class MarkProblemHistory implements Serializable {
     public void setScoreList(String scoreList) {
         this.scoreList = scoreList;
     }
-    public LocalDateTime getCreateTime() {
+    public Long getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(LocalDateTime createTime) {
+    public void setCreateTime(Long createTime) {
         this.createTime = createTime;
     }
-    public LocalDateTime getUpdateTime() {
+    public Long getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(LocalDateTime updateTime) {
+    public void setUpdateTime(Long updateTime) {
         this.updateTime = updateTime;
     }
     public String getRemark() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkSubjectiveScore.java

@@ -23,7 +23,7 @@ public class MarkSubjectiveScore implements Serializable {
 
     @ApiModelProperty(value = "考生ID")
     @TableId(value = "student_id", type = IdType.AUTO)
-    private Integer studentId;
+    private Long studentId;
 
     @ApiModelProperty(value = "大题号")
     private Integer mainNumber;
@@ -32,7 +32,7 @@ public class MarkSubjectiveScore implements Serializable {
     private String subNumber;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "课程代码")
     private String paperNumber;
@@ -52,11 +52,11 @@ public class MarkSubjectiveScore implements Serializable {
     @ApiModelProperty(value = "是否合分")
     private Boolean uncalculate;
 
-    public Integer getStudentId() {
+    public Long getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(Integer studentId) {
+    public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
     public Integer getMainNumber() {
@@ -73,11 +73,11 @@ public class MarkSubjectiveScore implements Serializable {
     public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkTask.java

@@ -1,13 +1,13 @@
 package com.qmth.teachcloud.mark.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 评卷任务表
@@ -24,10 +24,10 @@ public class MarkTask implements Serializable {
 
     @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
@@ -36,7 +36,7 @@ public class MarkTask implements Serializable {
     private Integer groupNumber;
 
     @ApiModelProperty(value = "考生ID")
-    private Integer studentId;
+    private Long studentId;
 
     @ApiModelProperty(value = "学号")
     private String studentCode;
@@ -51,10 +51,10 @@ public class MarkTask implements Serializable {
     private String status;
 
     @ApiModelProperty(value = "评卷员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value = "评卷时间")
-    private LocalDateTime markerTime;
+    private Long markerTime;
 
     @ApiModelProperty(value = "评卷总分")
     private Double markerScore;
@@ -66,10 +66,10 @@ public class MarkTask implements Serializable {
     private Integer markerSpent;
 
     @ApiModelProperty(value = "科组长ID")
-    private Integer headerId;
+    private Long headerId;
 
     @ApiModelProperty(value = "科组长评卷时间")
-    private LocalDateTime headerTime;
+    private Long headerTime;
 
     @ApiModelProperty(value = "科组长总分")
     private Double headerScore;
@@ -77,18 +77,18 @@ public class MarkTask implements Serializable {
     @ApiModelProperty(value = "科组长给分明细")
     private String headerScoreList;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {
@@ -105,11 +105,11 @@ public class MarkTask implements Serializable {
     public void setGroupNumber(Integer groupNumber) {
         this.groupNumber = groupNumber;
     }
-    public Integer getStudentId() {
+    public Long getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(Integer studentId) {
+    public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
     public String getStudentCode() {
@@ -140,18 +140,18 @@ public class MarkTask implements Serializable {
     public void setStatus(String status) {
         this.status = status;
     }
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
-    public LocalDateTime getMarkerTime() {
+    public Long getMarkerTime() {
         return markerTime;
     }
 
-    public void setMarkerTime(LocalDateTime markerTime) {
+    public void setMarkerTime(Long markerTime) {
         this.markerTime = markerTime;
     }
     public Double getMarkerScore() {
@@ -175,18 +175,18 @@ public class MarkTask implements Serializable {
     public void setMarkerSpent(Integer markerSpent) {
         this.markerSpent = markerSpent;
     }
-    public Integer getHeaderId() {
+    public Long getHeaderId() {
         return headerId;
     }
 
-    public void setHeaderId(Integer headerId) {
+    public void setHeaderId(Long headerId) {
         this.headerId = headerId;
     }
-    public LocalDateTime getHeaderTime() {
+    public Long getHeaderTime() {
         return headerTime;
     }
 
-    public void setHeaderTime(LocalDateTime headerTime) {
+    public void setHeaderTime(Long headerTime) {
         this.headerTime = headerTime;
     }
     public Double getHeaderScore() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkTrack.java

@@ -23,7 +23,7 @@ public class MarkTrack implements Serializable {
 
     @ApiModelProperty(value = "评卷任务ID")
     @TableId(value = "task_id", type = IdType.AUTO)
-    private Integer taskId;
+    private Long taskId;
 
     @ApiModelProperty(value = "完整题号")
     private String questionNumber;
@@ -32,10 +32,10 @@ public class MarkTrack implements Serializable {
     private Integer number;
 
     @ApiModelProperty(value = "考生ID")
-    private Integer studentId;
+    private Long studentId;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
@@ -44,7 +44,7 @@ public class MarkTrack implements Serializable {
     private Integer groupNumber;
 
     @ApiModelProperty(value = "评卷员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value = "标记类型（SCORE：分数，REMARK：备注）")
     private String type;
@@ -70,11 +70,11 @@ public class MarkTrack implements Serializable {
     @ApiModelProperty(value = "裁切图Y轴坐标")
     private Integer offsetY;
 
-    public Integer getTaskId() {
+    public Long getTaskId() {
         return taskId;
     }
 
-    public void setTaskId(Integer taskId) {
+    public void setTaskId(Long taskId) {
         this.taskId = taskId;
     }
     public String getQuestionNumber() {
@@ -91,18 +91,18 @@ public class MarkTrack implements Serializable {
     public void setNumber(Integer number) {
         this.number = number;
     }
-    public Integer getStudentId() {
+    public Long getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(Integer studentId) {
+    public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {
@@ -119,11 +119,11 @@ public class MarkTrack implements Serializable {
     public void setGroupNumber(Integer groupNumber) {
         this.groupNumber = groupNumber;
     }
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
     public String getType() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkUserClass.java

@@ -22,7 +22,7 @@ public class MarkUserClass implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "Id", type = IdType.AUTO)
-    private Integer Id;
+    private Long Id;
 
     @ApiModelProperty(value = "考试ID")
     private Long examId;
@@ -36,11 +36,11 @@ public class MarkUserClass implements Serializable {
     @ApiModelProperty(value = "班级名称")
     private String classsName;
 
-    public Integer getId() {
+    public Long getId() {
         return Id;
     }
 
-    public void setId(Integer Id) {
+    public void setId(Long Id) {
         this.Id = Id;
     }
     public Long getExamId() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkUserGroup.java

@@ -23,10 +23,10 @@ public class MarkUserGroup implements Serializable {
 
     @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
@@ -35,7 +35,7 @@ public class MarkUserGroup implements Serializable {
     private Integer groupNumber;
 
     @ApiModelProperty(value = "用户ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value = "强制评卷模式")
     private String mode;
@@ -55,18 +55,18 @@ public class MarkUserGroup implements Serializable {
     @ApiModelProperty(value = "标准差")
     private Double stdevScore;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public String getPaperNumber() {
@@ -83,11 +83,11 @@ public class MarkUserGroup implements Serializable {
     public void setGroupNumber(Integer groupNumber) {
         this.groupNumber = groupNumber;
     }
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
     public String getMode() {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/ScanAnswerCardSubject.java

@@ -23,10 +23,10 @@ public class ScanAnswerCardSubject implements Serializable {
 
     @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    private Integer examId;
+    private Long examId;
 
     @ApiModelProperty(value = "卡格式号")
     private Integer cardNumber;
@@ -37,18 +37,18 @@ public class ScanAnswerCardSubject implements Serializable {
     @ApiModelProperty(value = "试卷编号（交互）")
     private String coursePaperId;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
-    public Integer getExamId() {
+    public Long getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(Long examId) {
         this.examId = examId;
     }
     public Integer getCardNumber() {