fix

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamListReq.java

@@ -2,6 +2,7 @@ package cn.com.qmth.examcloud.examwork.api.request;
 
 import java.util.List;
 
+import cn.com.qmth.examcloud.api.commons.enums.CallType;
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.api.commons.security.bean.UserDataRule;
 
@@ -16,7 +17,9 @@ public class GetExamListReq extends BaseRequest {
 	private List<String> examTypeList;
 
 	private Long start;
-	
+
+	private CallType callType;
+
 	private UserDataRule ud;
 
 	public Long getRootOrgId() {
@@ -59,6 +62,12 @@ public class GetExamListReq extends BaseRequest {
 		this.ud = ud;
 	}
 
+	public CallType getCallType() {
+		return callType;
+	}
+
+	public void setCallType(CallType callType) {
+		this.callType = callType;
+	}
 
-	
 }

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkWorkBean.java

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.marking.api.bean;
 import java.util.Date;
 import java.util.List;
 
+import cn.com.qmth.examcloud.api.commons.enums.CallType;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 /**
@@ -13,180 +14,188 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  */
 public class MarkWorkBean implements JsonSerializable {
 
-    private static final long serialVersionUID = -4913141821109915639L;
+	private static final long serialVersionUID = -4913141821109915639L;
 
-    private Long id;
+	private Long id;
 
-    private String name;
+	private String name;
 
-    private Date createdOn;
+	private Date createdOn;
 
-    private List<Long> examIds;
+	private List<Long> examIds;
+	private CallType callType;
+	private String remark;
 
-    private String remark;
+	private Long totalStudentPaper;
 
-    private Long totalStudentPaper;
+	private Long markedStudentPaper;
 
-    private Long markedStudentPaper;
+	private Long totalCourse;
 
-    private Long totalCourse;
+	private Long markedCourse;
 
-    private Long markedCourse;
+	private Long totalMarkItem;
 
-    private Long totalMarkItem;
+	private double progress;
 
-    private double progress;
+	private int status;
 
-    private int status;
+	private Long rootOrgId;
 
-    private Long rootOrgId;
+	private Long userId;
 
-    private Long userId;
+	private List<String> examNameAndType;
 
-    private List<String> examNameAndType;
+	private Boolean isEnd;
 
-    private Boolean isEnd;
+	private Long appendTime;
 
-    private Long appendTime;
+	public Long getId() {
+		return id;
+	}
 
-    public Long getId() {
-        return id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public Date getCreatedOn() {
+		return createdOn;
+	}
 
-    public Date getCreatedOn() {
-        return createdOn;
-    }
+	public void setCreatedOn(Date createdOn) {
+		this.createdOn = createdOn;
+	}
 
-    public void setCreatedOn(Date createdOn) {
-        this.createdOn = createdOn;
-    }
+	public List<Long> getExamIds() {
+		return examIds;
+	}
 
-    public List<Long> getExamIds() {
-        return examIds;
-    }
+	public void setExamIds(List<Long> examIds) {
+		this.examIds = examIds;
+	}
 
-    public void setExamIds(List<Long> examIds) {
-        this.examIds = examIds;
-    }
+	public String getRemark() {
+		return remark;
+	}
 
-    public String getRemark() {
-        return remark;
-    }
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
+	public Long getTotalStudentPaper() {
+		return totalStudentPaper;
+	}
 
-    public Long getTotalStudentPaper() {
-        return totalStudentPaper;
-    }
+	public void setTotalStudentPaper(Long totalStudentPaper) {
+		this.totalStudentPaper = totalStudentPaper;
+	}
 
-    public void setTotalStudentPaper(Long totalStudentPaper) {
-        this.totalStudentPaper = totalStudentPaper;
-    }
+	public Long getMarkedStudentPaper() {
+		return markedStudentPaper;
+	}
 
-    public Long getMarkedStudentPaper() {
-        return markedStudentPaper;
-    }
+	public void setMarkedStudentPaper(Long markedStudentPaper) {
+		this.markedStudentPaper = markedStudentPaper;
+	}
 
-    public void setMarkedStudentPaper(Long markedStudentPaper) {
-        this.markedStudentPaper = markedStudentPaper;
-    }
+	public Long getTotalCourse() {
+		return totalCourse;
+	}
 
-    public Long getTotalCourse() {
-        return totalCourse;
-    }
+	public void setTotalCourse(Long totalCourse) {
+		this.totalCourse = totalCourse;
+	}
 
-    public void setTotalCourse(Long totalCourse) {
-        this.totalCourse = totalCourse;
-    }
+	public Long getMarkedCourse() {
+		return markedCourse;
+	}
 
-    public Long getMarkedCourse() {
-        return markedCourse;
-    }
+	public void setMarkedCourse(Long markedCourse) {
+		this.markedCourse = markedCourse;
+	}
 
-    public void setMarkedCourse(Long markedCourse) {
-        this.markedCourse = markedCourse;
-    }
+	public Long getTotalMarkItem() {
+		return totalMarkItem;
+	}
 
-    public Long getTotalMarkItem() {
-        return totalMarkItem;
-    }
+	public void setTotalMarkItem(Long totalMarkItem) {
+		this.totalMarkItem = totalMarkItem;
+	}
 
-    public void setTotalMarkItem(Long totalMarkItem) {
-        this.totalMarkItem = totalMarkItem;
-    }
+	public double getProgress() {
+		return progress;
+	}
 
-    public double getProgress() {
-        return progress;
-    }
+	public void setProgress(double progress) {
+		this.progress = progress;
+	}
 
-    public void setProgress(double progress) {
-        this.progress = progress;
-    }
+	public int getStatus() {
+		return status;
+	}
 
-    public int getStatus() {
-        return status;
-    }
+	public void setStatus(int status) {
+		this.status = status;
+	}
 
-    public void setStatus(int status) {
-        this.status = status;
-    }
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
 
-    public Long getRootOrgId() {
-        return rootOrgId;
-    }
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
 
-    public void setRootOrgId(Long rootOrgId) {
-        this.rootOrgId = rootOrgId;
-    }
+	public Long getUserId() {
+		return userId;
+	}
 
-    public Long getUserId() {
-        return userId;
-    }
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
+	public List<String> getExamNameAndType() {
+		return examNameAndType;
+	}
 
-    public List<String> getExamNameAndType() {
-        return examNameAndType;
-    }
+	public void setExamNameAndType(List<String> examNameAndType) {
+		this.examNameAndType = examNameAndType;
+	}
 
-    public void setExamNameAndType(List<String> examNameAndType) {
-        this.examNameAndType = examNameAndType;
-    }
+	public MarkWorkBean() {
 
-    public MarkWorkBean() {
+	}
 
-    }
+	public Boolean getIsEnd() {
+		return isEnd;
+	}
 
-    public Boolean getIsEnd() {
-        return isEnd;
-    }
+	public void setIsEnd(Boolean isEnd) {
+		this.isEnd = isEnd;
+	}
 
-    public void setIsEnd(Boolean isEnd) {
-        this.isEnd = isEnd;
-    }
+	public Long getAppendTime() {
+		return appendTime;
+	}
 
-    public Long getAppendTime() {
-        return appendTime;
-    }
+	public void setAppendTime(Long appendTime) {
+		this.appendTime = appendTime;
+	}
 
-    public void setAppendTime(Long appendTime) {
-        this.appendTime = appendTime;
-    }
+	public CallType getCallType() {
+		return callType;
+	}
+
+	public void setCallType(CallType callType) {
+		this.callType = callType;
+	}
 
 }