Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-rpc.git

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamRecordForMarkingBean.java

@@ -50,7 +50,12 @@ public class ExamRecordForMarkingBean implements JsonSerializable{
 	/**
 	 * 文件名称:离线考试
 	 */
-	private String offlineFileName; 
+	private String offlineFileName;
+
+	/**
+	 * 批次号
+	 */
+	private String batchNum;
 
 	public Long getId() {
 		return id;
@@ -131,5 +136,12 @@ public class ExamRecordForMarkingBean implements JsonSerializable{
 	public void setOfflineFileName(String offlineFileName) {
 		this.offlineFileName = offlineFileName;
 	}
-	
+
+	public String getBatchNum() {
+		return batchNum;
+	}
+
+	public void setBatchNum(String batchNum) {
+		this.batchNum = batchNum;
+	}
 }

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/FindExamRecordForMarkingInfoReq.java

@@ -15,6 +15,11 @@ public class FindExamRecordForMarkingInfoReq extends BaseRequest{
 	
 	private Long courseId;
 
+	/**
+	 * 批次号
+	 */
+	private String batchNum;
+
 	public Long getId() {
 		return id;
 	}
@@ -39,4 +44,11 @@ public class FindExamRecordForMarkingInfoReq extends BaseRequest{
 		this.courseId = courseId;
 	}
 
+	public String getBatchNum() {
+		return batchNum;
+	}
+
+	public void setBatchNum(String batchNum) {
+		this.batchNum = batchNum;
+	}
 }

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/QueryScoreDataReq.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.core.oe.admin.api.request;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
 
 public class QueryScoreDataReq extends BaseRequest{
 
@@ -9,6 +10,10 @@ public class QueryScoreDataReq extends BaseRequest{
 	 */
 	private static final long serialVersionUID = 614271400814145847L;
 
+	@ApiModelProperty(value = "考试代码,推荐使用")
+	private String examCode;
+	@ApiModelProperty(value = "考试名称,已弃用,推荐使用examCode")
+	@Deprecated
 	private String examName;
 	
 	private Long rootOrgId;
@@ -19,6 +24,14 @@ public class QueryScoreDataReq extends BaseRequest{
 	
 	private String courseCode;
 
+	public String getExamCode() {
+		return examCode;
+	}
+
+	public void setExamCode(String examCode) {
+		this.examCode = examCode;
+	}
+
 	public String getExamName() {
 		return examName;
 	}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/QueryValidExamRecordInfoPageReq.java

@@ -15,7 +15,10 @@ public class QueryValidExamRecordInfoPageReq extends BaseRequest {
 
 	private Long start;
 	private Long size;
-
+	/**
+	 * 批次号
+	 */
+	private String batchNum;
 	public Long getExamId() {
 		return examId;
 	}
@@ -48,4 +51,11 @@ public class QueryValidExamRecordInfoPageReq extends BaseRequest {
 		this.size = size;
 	}
 
+	public String getBatchNum() {
+		return batchNum;
+	}
+
+	public void setBatchNum(String batchNum) {
+		this.batchNum = batchNum;
+	}
 }