3.3.0 update

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

@@ -23,149 +23,161 @@ import io.swagger.annotations.ApiModelProperty;
  * @author xf
  * @since 2023-09-22
  */
-@TableName("scan_omr_task")
-@ApiModel(value="ScanOmrTask对象", description="")
+@TableName(value = "scan_omr_task", autoResultMap = true)
+@ApiModel(value = "ScanOmrTask对象", description = "")
 public class ScanOmrTask implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableId(value = "id")
-    private Long id;
+	@JsonSerialize(using = ToStringSerializer.class)
+	@TableId(value = "id")
+	private Long id;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试ID")
-    private Long examId;
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "考试ID")
+	private Long examId;
 
-    @ApiModelProperty(value = "条件")
-    private String conditions;
+	@ApiModelProperty(value = "条件")
+	private String conditions;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考生ID")
-    private Long studentId;
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "考生ID")
+	private Long studentId;
 
-    @ApiModelProperty(value = "试卷页数")
-    private Integer paperIndex;
+	@ApiModelProperty(value = "试卷页数")
+	private Integer paperIndex;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "试卷ID")
-    private Long paperId;
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "试卷ID")
+	private Long paperId;
 
-    @ApiModelProperty(value = "题卡编号")
-    private Integer cardNumber;
+	@ApiModelProperty(value = "题卡编号")
+	private Integer cardNumber;
 
-    @ApiModelProperty(value = "状态")
-    private OmrTaskStatus status;
+	@ApiModelProperty(value = "状态")
+	private OmrTaskStatus status;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long userId;
 
-    @TableField(value = "pages", typeHandler = OmrTaskPageListTypeHandler.class)
-    private List<OmrTaskPage> pages;
+	@TableField(value = "pages", typeHandler = OmrTaskPageListTypeHandler.class)
+	private List<OmrTaskPage> pages;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long creatorId;
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long creatorId;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long updaterId;
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long updaterId;
 
-    private Long createTime;
+	private Long createTime;
 
-    private Long updateTime;
+	private Long updateTime;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public Long getExamId() {
-        return examId;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-    public String getConditions() {
-        return conditions;
-    }
+	public Long getExamId() {
+		return examId;
+	}
 
-    public void setConditions(String conditions) {
-        this.conditions = conditions;
-    }
-    public Long getStudentId() {
-        return studentId;
-    }
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
 
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
-    }
-    public Integer getPaperIndex() {
-        return paperIndex;
-    }
+	public String getConditions() {
+		return conditions;
+	}
 
-    public void setPaperIndex(Integer paperIndex) {
-        this.paperIndex = paperIndex;
-    }
-    public Long getPaperId() {
-        return paperId;
-    }
+	public void setConditions(String conditions) {
+		this.conditions = conditions;
+	}
 
-    public void setPaperId(Long paperId) {
-        this.paperId = paperId;
-    }
-    public Integer getCardNumber() {
-        return cardNumber;
-    }
+	public Long getStudentId() {
+		return studentId;
+	}
 
-    public void setCardNumber(Integer cardNumber) {
-        this.cardNumber = cardNumber;
-    }
-    public OmrTaskStatus getStatus() {
-        return status;
-    }
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
 
-    public void setStatus(OmrTaskStatus status) {
-        this.status = status;
-    }
-    public Long getUserId() {
-        return userId;
-    }
+	public Integer getPaperIndex() {
+		return paperIndex;
+	}
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-    public Long getCreatorId() {
-        return creatorId;
-    }
+	public void setPaperIndex(Integer paperIndex) {
+		this.paperIndex = paperIndex;
+	}
 
-    public void setCreatorId(Long creatorId) {
-        this.creatorId = creatorId;
-    }
-    public Long getUpdaterId() {
-        return updaterId;
-    }
+	public Long getPaperId() {
+		return paperId;
+	}
 
-    public void setUpdaterId(Long updaterId) {
-        this.updaterId = updaterId;
-    }
-    public Long getCreateTime() {
-        return createTime;
-    }
+	public void setPaperId(Long paperId) {
+		this.paperId = paperId;
+	}
 
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-    public Long getUpdateTime() {
-        return updateTime;
-    }
+	public Integer getCardNumber() {
+		return cardNumber;
+	}
 
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
+	public void setCardNumber(Integer cardNumber) {
+		this.cardNumber = cardNumber;
+	}
+
+	public OmrTaskStatus getStatus() {
+		return status;
+	}
+
+	public void setStatus(OmrTaskStatus status) {
+		this.status = status;
+	}
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public Long getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Long creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Long getUpdaterId() {
+		return updaterId;
+	}
+
+	public void setUpdaterId(Long updaterId) {
+		this.updaterId = updaterId;
+	}
+
+	public Long getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Long createTime) {
+		this.createTime = createTime;
+	}
+
+	public Long getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Long updateTime) {
+		this.updateTime = updateTime;
+	}
 
-    public List<OmrTaskPage> getPages() {
+	public List<OmrTaskPage> getPages() {
 		return pages;
 	}
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/handle/OmrTaskPageListTypeHandler.java

@@ -3,13 +3,13 @@ package com.qmth.teachcloud.mark.handle;
 import java.util.List;
 
 import com.google.gson.reflect.TypeToken;
-import com.qmth.teachcloud.mark.entity.ScanPaperPage;
+import com.qmth.teachcloud.mark.bean.OmrTaskPage;
 
-public class OmrTaskPageListTypeHandler extends ListTypeHandler<ScanPaperPage> {
+public class OmrTaskPageListTypeHandler extends ListTypeHandler<OmrTaskPage> {
 
 	@Override
-	protected TypeToken<List<ScanPaperPage>> specificType() {
-		return new TypeToken<List<ScanPaperPage>>() {
+	protected TypeToken<List<OmrTaskPage>> specificType() {
+		return new TypeToken<List<OmrTaskPage>>() {
 		};
 	}