随考随阅

examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkTaskCloudServiceClient.java

@@ -1,39 +1,35 @@
-package cn.com.qmth.examcloud.marking.api.client;
-
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.marking.api.MarkTaskCloudService;
-import cn.com.qmth.examcloud.marking.api.request.GetMarkTaskReq;
-import cn.com.qmth.examcloud.marking.api.request.UpdateMarkTaskReq;
-import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
-import cn.com.qmth.examcloud.marking.api.response.UpdateMarkTaskResp;
-
-/**
- * @ClassName MarkTaskCloudServiceClient
- * @Description TODO
- * @Author nikang
- * @Date 2018/11/27 17:21
- * @Version 3.0
- */
-@Service
-public class MarkTaskCloudServiceClient extends AbstractCloudClientSupport
-		implements
-			MarkTaskCloudService {
-
-	private static final long serialVersionUID = 3713704339599845609L;
-
-	@Override
-	public GetMarkTaskResp getMarkTask(GetMarkTaskReq req) {
-		return post("markTask/getMarkTask", req, GetMarkTaskResp.class);
-	}
-
-//	@Override
-//	public SaveMarkTaskResp saveMarkTask(SaveMarkTaskReq req) {
-//		return post("markTask/saveMarkTask", req, SaveMarkTaskResp.class);
-//	}
-
-	@Override
-	public UpdateMarkTaskResp updateMarkTask(UpdateMarkTaskReq req) {
-		return post("markTask/updateMarkTask", req, UpdateMarkTaskResp.class);
-	}
-}
+package cn.com.qmth.examcloud.marking.api.client;
+
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.marking.api.MarkTaskCloudService;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkTaskReq;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
+
+/**
+ * @ClassName MarkTaskCloudServiceClient
+ * @Description
+ * @Author nikang
+ * @Date 2018/11/27 17:21
+ * @Version 3.0
+ */
+@Service
+public class MarkTaskCloudServiceClient extends AbstractCloudClientSupport implements MarkTaskCloudService {
+
+    private static final long serialVersionUID = 3713704339599845609L;
+
+    @Override
+    public GetMarkTaskResp getMarkTask(GetMarkTaskReq req) {
+        return post("markTask/getMarkTask", req, GetMarkTaskResp.class);
+    }
+
+    // @Override
+    // public SaveMarkTaskResp saveMarkTask(SaveMarkTaskReq req) {
+    // return post("markTask/saveMarkTask", req, SaveMarkTaskResp.class);
+    // }
+
+    // @Override
+    // public UpdateMarkTaskResp updateMarkTask(UpdateMarkTaskReq req) {
+    // return post("markTask/updateMarkTask", req, UpdateMarkTaskResp.class);
+    // }
+}

examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkWorkCloudServiceClient.java

@@ -1,73 +1,84 @@
-package cn.com.qmth.examcloud.marking.api.client;
-
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.marking.api.MarkWorkCloudService;
-import cn.com.qmth.examcloud.marking.api.request.AppendMarkWorkPaperReq;
-import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkMainByIdsReq;
-import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkMarkerPageReq;
-import cn.com.qmth.examcloud.marking.api.request.GetMarkersByWorkIdsReq;
-import cn.com.qmth.examcloud.marking.api.request.SaveMarkWorkReq;
-import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkReq;
-import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkStatusReq;
-import cn.com.qmth.examcloud.marking.api.response.AppendMarkWorkPaperResp;
-import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkMainByIdsResp;
-import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkMarkerPageResp;
-import cn.com.qmth.examcloud.marking.api.response.GetMarkersByWorkIdsResp;
-import cn.com.qmth.examcloud.marking.api.response.GetTodoMarkWorkMainResp;
-import cn.com.qmth.examcloud.marking.api.response.SaveMarkWorkResp;
-import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkResp;
-import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkStatusResp;
-
-/**
- * @ClassName MarkWorkCloudServiceClient
- * @Author nikang
- * @Date 2018/11/26 13:45
- * @Version 3.0
- */
-@Service
-public class MarkWorkCloudServiceClient extends AbstractCloudClientSupport implements MarkWorkCloudService {
-
-    private static final long serialVersionUID = -8517217664310649037L;
-
-
-    @Override
-    public SaveMarkWorkResp saveMarkWork(SaveMarkWorkReq req) {
-        return post("markWorks/saveMarkWork", req, SaveMarkWorkResp.class);
-    }
-
-    @Override
-    public UpdateMarkWorkResp updateMarkWork(UpdateMarkWorkReq req) {
-        return post("markWorks/updateMarkWork", req, UpdateMarkWorkResp.class);
-    }
-
-    @Override
-    public GetMarkWorkMarkerPageResp getMarkWorkMarkerPage(GetMarkWorkMarkerPageReq req) {
-        return post("markWorks/getMarkWorkMarkerPage", req, GetMarkWorkMarkerPageResp.class);
-    }
-
-    @Override
-    public GetMarkWorkMainByIdsResp getMarkWorkMainByIds(GetMarkWorkMainByIdsReq req) {
-        return post("markWorks/getMarkWorkMainByIds", req, GetMarkWorkMainByIdsResp.class);
-    }
-
-    @Override
-    public GetMarkersByWorkIdsResp getMarkersByWorkIds(GetMarkersByWorkIdsReq req) {
-        return post("markWorks/getMarkersByWorkIds", req, GetMarkersByWorkIdsResp.class);
-    }
-
-    @Override
-    public AppendMarkWorkPaperResp appendMarkWorkPaper(AppendMarkWorkPaperReq req) {
-        return post("markWorks/appendMarkWorkPaper", req, AppendMarkWorkPaperResp.class);
-    }
-
-    @Override
-    public GetTodoMarkWorkMainResp getTodoMarkWorkMain() {
-        return post("markWorks/getTodoMarkWorkMain", null, GetTodoMarkWorkMainResp.class);
-    }
-
-    @Override
-    public UpdateMarkWorkStatusResp updateMarkWorkStatus(UpdateMarkWorkStatusReq req) {
-        return post("markWorks/updateMarkWorkStatus", req, UpdateMarkWorkStatusResp.class);
-    }
-}
+package cn.com.qmth.examcloud.marking.api.client;
+
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.marking.api.MarkWorkCloudService;
+import cn.com.qmth.examcloud.marking.api.request.AppendMarkWorkPaperReq;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkExamReq;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkMainByIdsReq;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkMarkerPageReq;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkersByWorkIdsReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkExamDataEndReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkStatusReq;
+import cn.com.qmth.examcloud.marking.api.response.AppendMarkWorkPaperResp;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkExamResp;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkMainByIdsResp;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkMarkerPageResp;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkersByWorkIdsResp;
+import cn.com.qmth.examcloud.marking.api.response.GetTodoMarkWorkMainResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkExamDataEndResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkStatusResp;
+
+/**
+ * @ClassName MarkWorkCloudServiceClient
+ * @Author nikang
+ * @Date 2018/11/26 13:45
+ * @Version 3.0
+ */
+@Service
+public class MarkWorkCloudServiceClient extends AbstractCloudClientSupport implements MarkWorkCloudService {
+
+    private static final long serialVersionUID = -8517217664310649037L;
+
+    // @Override
+    // public SaveMarkWorkResp saveMarkWork(SaveMarkWorkReq req) {
+    // return post("markWorks/saveMarkWork", req, SaveMarkWorkResp.class);
+    // }
+
+    @Override
+    public UpdateMarkWorkResp updateMarkWork(UpdateMarkWorkReq req) {
+        return post("markWorks/updateMarkWork", req, UpdateMarkWorkResp.class);
+    }
+
+    @Override
+    public GetMarkWorkMarkerPageResp getMarkWorkMarkerPage(GetMarkWorkMarkerPageReq req) {
+        return post("markWorks/getMarkWorkMarkerPage", req, GetMarkWorkMarkerPageResp.class);
+    }
+
+    @Override
+    public GetMarkWorkMainByIdsResp getMarkWorkMainByIds(GetMarkWorkMainByIdsReq req) {
+        return post("markWorks/getMarkWorkMainByIds", req, GetMarkWorkMainByIdsResp.class);
+    }
+
+    @Override
+    public GetMarkersByWorkIdsResp getMarkersByWorkIds(GetMarkersByWorkIdsReq req) {
+        return post("markWorks/getMarkersByWorkIds", req, GetMarkersByWorkIdsResp.class);
+    }
+
+    @Override
+    public AppendMarkWorkPaperResp appendMarkWorkPaper(AppendMarkWorkPaperReq req) {
+        return post("markWorks/appendMarkWorkPaper", req, AppendMarkWorkPaperResp.class);
+    }
+
+    @Override
+    public GetTodoMarkWorkMainResp getTodoMarkWorkMain() {
+        return post("markWorks/getTodoMarkWorkMain", null, GetTodoMarkWorkMainResp.class);
+    }
+
+    @Override
+    public UpdateMarkWorkStatusResp updateMarkWorkStatus(UpdateMarkWorkStatusReq req) {
+        return post("markWorks/updateMarkWorkStatus", req, UpdateMarkWorkStatusResp.class);
+    }
+
+    @Override
+    public GetMarkWorkExamResp getMarkWorkExam(GetMarkWorkExamReq req) {
+        return post("markWorks/getMarkWorkExam", req, GetMarkWorkExamResp.class);
+    }
+
+    @Override
+    public UpdateMarkWorkExamDataEndResp updateMarkWorkExamDataEnd(UpdateMarkWorkExamDataEndReq req) {
+        return post("markWorks/updateMarkWorkExamDataEnd", req, UpdateMarkWorkExamDataEndResp.class);
+    }
+}

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

@@ -1,32 +1,30 @@
-package cn.com.qmth.examcloud.marking.api;
-
-import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.marking.api.request.GetMarkTaskReq;
-import cn.com.qmth.examcloud.marking.api.request.UpdateMarkTaskReq;
-import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
-import cn.com.qmth.examcloud.marking.api.response.UpdateMarkTaskResp;
-
-/**
- * @ClassName MarkTaskCloudService
- * @Description TODO
- * @Author nikang
- * @Date 2018/11/27 17:12
- * @Version 3.0
- */
-public interface MarkTaskCloudService extends CloudService {
-    /**
-     * 获取评卷任务集
-     */
-    GetMarkTaskResp getMarkTask(GetMarkTaskReq req);
-
-    /**
-     * 导入评卷任务时新增评卷任务数据
-     */
-//    SaveMarkTaskResp saveMarkTask(SaveMarkTaskReq req);
-
-    /**
-     * 更新评卷任务：
-     * 后台操作逻辑包括：save,update,delete操作，详情看具体服务
-     */
-    UpdateMarkTaskResp updateMarkTask(UpdateMarkTaskReq req);
-}
+package cn.com.qmth.examcloud.marking.api;
+
+import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkTaskReq;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
+
+/**
+ * @ClassName MarkTaskCloudService
+ * @Description
+ * @Author nikang
+ * @Date 2018/11/27 17:12
+ * @Version 3.0
+ */
+public interface MarkTaskCloudService extends CloudService {
+
+    /**
+     * 获取评卷任务集
+     */
+    GetMarkTaskResp getMarkTask(GetMarkTaskReq req);
+
+    /**
+     * 导入评卷任务时新增评卷任务数据
+     */
+    // SaveMarkTaskResp saveMarkTask(SaveMarkTaskReq req);
+
+    /**
+     * 更新评卷任务： 后台操作逻辑包括：save,update,delete操作，详情看具体服务
+     */
+    // UpdateMarkTaskResp updateMarkTask(UpdateMarkTaskReq req);
+}

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

@@ -1,49 +1,55 @@
-package cn.com.qmth.examcloud.marking.api;
-
-import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.marking.api.request.AppendMarkWorkPaperReq;
-import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkMainByIdsReq;
-import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkMarkerPageReq;
-import cn.com.qmth.examcloud.marking.api.request.GetMarkersByWorkIdsReq;
-import cn.com.qmth.examcloud.marking.api.request.SaveMarkWorkReq;
-import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkReq;
-import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkStatusReq;
-import cn.com.qmth.examcloud.marking.api.response.AppendMarkWorkPaperResp;
-import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkMainByIdsResp;
-import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkMarkerPageResp;
-import cn.com.qmth.examcloud.marking.api.response.GetMarkersByWorkIdsResp;
-import cn.com.qmth.examcloud.marking.api.response.GetTodoMarkWorkMainResp;
-import cn.com.qmth.examcloud.marking.api.response.SaveMarkWorkResp;
-import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkResp;
-import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkStatusResp;
-
-/**
- * @ClassName MarkWorkCloudService
- * @Author nikang
- * @Date 2018/11/26 13:41
- * @Version 3.0
- */
-public interface MarkWorkCloudService extends CloudService {
-
-    /**
-     * 保存阅卷工作
-     */
-    SaveMarkWorkResp saveMarkWork(SaveMarkWorkReq req);
-
-    /**
-     * 更新阅卷工作
-     */
-    UpdateMarkWorkResp updateMarkWork(UpdateMarkWorkReq req);
-
-    GetMarkWorkMarkerPageResp getMarkWorkMarkerPage(GetMarkWorkMarkerPageReq req);
-
-    GetMarkWorkMainByIdsResp getMarkWorkMainByIds(GetMarkWorkMainByIdsReq req);
-
-    GetMarkersByWorkIdsResp getMarkersByWorkIds(GetMarkersByWorkIdsReq req);
-
-    AppendMarkWorkPaperResp appendMarkWorkPaper(AppendMarkWorkPaperReq req);
-
-    GetTodoMarkWorkMainResp getTodoMarkWorkMain();
-
-    UpdateMarkWorkStatusResp updateMarkWorkStatus(UpdateMarkWorkStatusReq req);
-}
+package cn.com.qmth.examcloud.marking.api;
+
+import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.marking.api.request.AppendMarkWorkPaperReq;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkExamReq;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkMainByIdsReq;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkMarkerPageReq;
+import cn.com.qmth.examcloud.marking.api.request.GetMarkersByWorkIdsReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkExamDataEndReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkReq;
+import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkStatusReq;
+import cn.com.qmth.examcloud.marking.api.response.AppendMarkWorkPaperResp;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkExamResp;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkMainByIdsResp;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkMarkerPageResp;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkersByWorkIdsResp;
+import cn.com.qmth.examcloud.marking.api.response.GetTodoMarkWorkMainResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkExamDataEndResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkResp;
+import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkStatusResp;
+
+/**
+ * @ClassName MarkWorkCloudService
+ * @Author nikang
+ * @Date 2018/11/26 13:41
+ * @Version 3.0
+ */
+public interface MarkWorkCloudService extends CloudService {
+
+    /**
+     * 保存阅卷工作
+     */
+    // SaveMarkWorkResp saveMarkWork(SaveMarkWorkReq req);
+
+    /**
+     * 更新阅卷工作
+     */
+    UpdateMarkWorkResp updateMarkWork(UpdateMarkWorkReq req);
+
+    GetMarkWorkMarkerPageResp getMarkWorkMarkerPage(GetMarkWorkMarkerPageReq req);
+
+    GetMarkWorkMainByIdsResp getMarkWorkMainByIds(GetMarkWorkMainByIdsReq req);
+
+    GetMarkersByWorkIdsResp getMarkersByWorkIds(GetMarkersByWorkIdsReq req);
+
+    AppendMarkWorkPaperResp appendMarkWorkPaper(AppendMarkWorkPaperReq req);
+
+    GetTodoMarkWorkMainResp getTodoMarkWorkMain();
+
+    UpdateMarkWorkStatusResp updateMarkWorkStatus(UpdateMarkWorkStatusReq req);
+
+    GetMarkWorkExamResp getMarkWorkExam(GetMarkWorkExamReq req);
+
+    UpdateMarkWorkExamDataEndResp updateMarkWorkExamDataEnd(UpdateMarkWorkExamDataEndReq req);
+}

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

@@ -1,41 +1,66 @@
-package cn.com.qmth.examcloud.marking.api.bean;
-
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-
-public class BasePaperBean implements JsonSerializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -2522829579622400375L;
-
-    private String basePaperId;
-
-    private String basePaperName;
-    private Boolean randomPaper;
-
-    public String getBasePaperId() {
-        return basePaperId;
-    }
-
-    public void setBasePaperId(String basePaperId) {
-        this.basePaperId = basePaperId;
-    }
-
-    public String getBasePaperName() {
-        return basePaperName;
-    }
-
-    public void setBasePaperName(String basePaperName) {
-        this.basePaperName = basePaperName;
-    }
-
-	public Boolean getRandomPaper() {
-		return randomPaper;
-	}
-
-	public void setRandomPaper(Boolean randomPaper) {
-		this.randomPaper = randomPaper;
-	}
-
-}
+package cn.com.qmth.examcloud.marking.api.bean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+public class BasePaperBean implements JsonSerializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -2522829579622400375L;
+
+    private String basePaperId;
+
+    private String basePaperName;
+
+    // 一个basePaperId只会有一种值
+    private Boolean randomPaper;
+
+    // 一个basePaperId可能对应多个值，在多个考试用同一个试卷时。优先anyTimeMark=true的值
+    private Boolean anyTimeMark;
+
+    public BasePaperBean() {
+        super();
+    }
+
+    public BasePaperBean(String basePaperId, String basePaperName, Boolean randomPaper, Boolean anyTimeMark) {
+        super();
+        this.basePaperId = basePaperId;
+        this.basePaperName = basePaperName;
+        this.randomPaper = randomPaper;
+        this.anyTimeMark = anyTimeMark;
+    }
+
+    public String getBasePaperId() {
+        return basePaperId;
+    }
+
+    public void setBasePaperId(String basePaperId) {
+        this.basePaperId = basePaperId;
+    }
+
+    public String getBasePaperName() {
+        return basePaperName;
+    }
+
+    public void setBasePaperName(String basePaperName) {
+        this.basePaperName = basePaperName;
+    }
+
+    public Boolean getRandomPaper() {
+        return randomPaper;
+    }
+
+    public void setRandomPaper(Boolean randomPaper) {
+        this.randomPaper = randomPaper;
+    }
+
+    public Boolean getAnyTimeMark() {
+        return anyTimeMark;
+    }
+
+    public void setAnyTimeMark(Boolean anyTimeMark) {
+        this.anyTimeMark = anyTimeMark;
+    }
+
+}

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

@@ -0,0 +1,52 @@
+package cn.com.qmth.examcloud.marking.api.bean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+public class BasePaperCourseBean implements JsonSerializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -2522829579622400375L;
+
+    private String basePaperId;
+
+    private String basePaperName;
+
+    private Boolean randomPaper;
+
+    private String courseCode;
+
+    public String getBasePaperId() {
+        return basePaperId;
+    }
+
+    public void setBasePaperId(String basePaperId) {
+        this.basePaperId = basePaperId;
+    }
+
+    public String getBasePaperName() {
+        return basePaperName;
+    }
+
+    public void setBasePaperName(String basePaperName) {
+        this.basePaperName = basePaperName;
+    }
+
+    public Boolean getRandomPaper() {
+        return randomPaper;
+    }
+
+    public void setRandomPaper(Boolean randomPaper) {
+        this.randomPaper = randomPaper;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+}

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

@@ -1,252 +1,291 @@
-package cn.com.qmth.examcloud.marking.api.bean;
-
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-
-/**
- * @ClassName MarkTaskBean
- * @Author nikang
- * @Date 2018/11/27 17:03
- * @Version 3.0
- */
-public class MarkTaskBean implements JsonSerializable {
-
-    private static final long serialVersionUID = -5290322662893858995L;
-
-    private Long id;
-    private Long userId;
-    private String userName;
-    private String userLoginName;
-    private Long workId;
-    private Long examId;
-    private Long markRangeId;
-    private String markRangeName;
-    private String basePaperId;
-    private String basePaperName;
-    private String paperType;
-    private String courseName;
-    private String courseCode;
-    private Long courseId;
-    /**
-     * 限制数量
-     */
-    private Long limitCount;
-
-    private Long markedCount;
-    private Long leftCount;
-    private Long totalCount;
-
-    private Long[] userIds;
-
-    private Double maxScore;
-    private Double minScore;
-    private Double avgScore;
-    private Double stdDev;
-
-    private Long rootOrgId;
-    
-    private Boolean exceedLimit;
-
-    public MarkTaskBean() {
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getUserLoginName() {
-        return userLoginName;
-    }
-
-    public void setUserLoginName(String userLoginName) {
-        this.userLoginName = userLoginName;
-    }
-
-    public Long getWorkId() {
-        return workId;
-    }
-
-    public void setWorkId(Long workId) {
-        this.workId = workId;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getMarkRangeId() {
-        return markRangeId;
-    }
-
-    public void setMarkRangeId(Long markRangeId) {
-        this.markRangeId = markRangeId;
-    }
-
-    public String getMarkRangeName() {
-        return markRangeName;
-    }
-
-    public void setMarkRangeName(String markRangeName) {
-        this.markRangeName = markRangeName;
-    }
-
-    public String getBasePaperId() {
-        return basePaperId;
-    }
-
-    public void setBasePaperId(String basePaperId) {
-        this.basePaperId = basePaperId;
-    }
-
-    public String getBasePaperName() {
-        return basePaperName;
-    }
-
-    public void setBasePaperName(String basePaperName) {
-        this.basePaperName = basePaperName;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public Long getLimitCount() {
-        return limitCount;
-    }
-
-    public void setLimitCount(Long limitCount) {
-        this.limitCount = limitCount;
-    }
-
-    public Long getMarkedCount() {
-        return markedCount;
-    }
-
-    public void setMarkedCount(Long markedCount) {
-        this.markedCount = markedCount;
-    }
-
-    public Long getLeftCount() {
-        return leftCount;
-    }
-
-    public void setLeftCount(Long leftCount) {
-        this.leftCount = leftCount;
-    }
-
-    public Long getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Long totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public Long[] getUserIds() {
-        return userIds;
-    }
-
-    public void setUserIds(Long[] userIds) {
-        this.userIds = userIds;
-    }
-
-    public Double getMaxScore() {
-        return maxScore;
-    }
-
-    public void setMaxScore(Double maxScore) {
-        this.maxScore = maxScore;
-    }
-
-    public Double getMinScore() {
-        return minScore;
-    }
-
-    public void setMinScore(Double minScore) {
-        this.minScore = minScore;
-    }
-
-    public Double getAvgScore() {
-        return avgScore;
-    }
-
-    public void setAvgScore(Double avgScore) {
-        this.avgScore = avgScore;
-    }
-
-    public Double getStdDev() {
-        return stdDev;
-    }
-
-    public void setStdDev(Double stdDev) {
-        this.stdDev = stdDev;
-    }
-
-    public Long getRootOrgId() {
-        return rootOrgId;
-    }
-
-    public void setRootOrgId(Long rootOrgId) {
-        this.rootOrgId = rootOrgId;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-	public Boolean getExceedLimit() {
-		return exceedLimit;
-	}
-
-	public void setExceedLimit(Boolean exceedLimit) {
-		this.exceedLimit = exceedLimit;
-	}
-
-}
+package cn.com.qmth.examcloud.marking.api.bean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+/**
+ * @ClassName MarkTaskBean
+ * @Author nikang
+ * @Date 2018/11/27 17:03
+ * @Version 3.0
+ */
+public class MarkTaskBean implements JsonSerializable {
+
+    private static final long serialVersionUID = -5290322662893858995L;
+
+    private Boolean randomPaper;
+
+    private Boolean anyTimeMark;
+
+    private Long id;
+
+    private Long userId;
+
+    private String userName;
+
+    private String userLoginName;
+
+    private Long workId;
+
+    private Long examId;
+
+    private Long markRangeId;
+
+    private String markRangeName;
+
+    private String basePaperId;
+
+    private String basePaperName;
+
+    private String paperType;
+
+    private String courseName;
+
+    private String courseCode;
+
+    private Long courseId;
+
+    /**
+     * 限制数量
+     */
+    private Long limitCount;
+
+    private Long markedCount;
+
+    private Long leftCount;
+
+    private Long totalCount;
+
+    private Long[] userIds;
+
+    private Double maxScore;
+
+    private Double minScore;
+
+    private Double avgScore;
+
+    private Double stdDev;
+
+    private Long rootOrgId;
+
+    private Boolean exceedLimit;
+
+    public MarkTaskBean() {
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getMarkRangeId() {
+        return markRangeId;
+    }
+
+    public void setMarkRangeId(Long markRangeId) {
+        this.markRangeId = markRangeId;
+    }
+
+    public String getMarkRangeName() {
+        return markRangeName;
+    }
+
+    public void setMarkRangeName(String markRangeName) {
+        this.markRangeName = markRangeName;
+    }
+
+    public String getBasePaperId() {
+        return basePaperId;
+    }
+
+    public void setBasePaperId(String basePaperId) {
+        this.basePaperId = basePaperId;
+    }
+
+    public String getBasePaperName() {
+        return basePaperName;
+    }
+
+    public void setBasePaperName(String basePaperName) {
+        this.basePaperName = basePaperName;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public Long getLimitCount() {
+        return limitCount;
+    }
+
+    public void setLimitCount(Long limitCount) {
+        this.limitCount = limitCount;
+    }
+
+    public Long getMarkedCount() {
+        return markedCount;
+    }
+
+    public void setMarkedCount(Long markedCount) {
+        this.markedCount = markedCount;
+    }
+
+    public Long getLeftCount() {
+        return leftCount;
+    }
+
+    public void setLeftCount(Long leftCount) {
+        this.leftCount = leftCount;
+    }
+
+    public Long getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Long totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public Long[] getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(Long[] userIds) {
+        this.userIds = userIds;
+    }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public Double getMinScore() {
+        return minScore;
+    }
+
+    public void setMinScore(Double minScore) {
+        this.minScore = minScore;
+    }
+
+    public Double getAvgScore() {
+        return avgScore;
+    }
+
+    public void setAvgScore(Double avgScore) {
+        this.avgScore = avgScore;
+    }
+
+    public Double getStdDev() {
+        return stdDev;
+    }
+
+    public void setStdDev(Double stdDev) {
+        this.stdDev = stdDev;
+    }
+
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Boolean getExceedLimit() {
+        return exceedLimit;
+    }
+
+    public void setExceedLimit(Boolean exceedLimit) {
+        this.exceedLimit = exceedLimit;
+    }
+
+    public Boolean getRandomPaper() {
+        return randomPaper;
+    }
+
+    public void setRandomPaper(Boolean randomPaper) {
+        this.randomPaper = randomPaper;
+    }
+
+    public Boolean getAnyTimeMark() {
+        return anyTimeMark;
+    }
+
+    public void setAnyTimeMark(Boolean anyTimeMark) {
+        this.anyTimeMark = anyTimeMark;
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package cn.com.qmth.examcloud.marking.api.bean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+public class MarkWorkExamBean implements JsonSerializable {
+
+    private static final long serialVersionUID = -4913141821109915639L;
+
+    private Long workId;
+
+    private Long examId;
+
+    private Boolean dataEnd;
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Boolean getDataEnd() {
+        return dataEnd;
+    }
+
+    public void setDataEnd(Boolean dataEnd) {
+        this.dataEnd = dataEnd;
+    }
+
+}

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetMarkWorkExamReq.java

@@ -0,0 +1,18 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class GetMarkWorkExamReq extends BaseRequest {
+
+    private static final long serialVersionUID = 2589023055968985565L;
+
+    private Long workId;
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+}

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/UpdateMarkWorkExamDataEndReq.java

@@ -0,0 +1,39 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class UpdateMarkWorkExamDataEndReq extends BaseRequest {
+
+    private static final long serialVersionUID = 2589023055968985565L;
+
+    private Long workId;
+
+    private Long examId;
+
+    public UpdateMarkWorkExamDataEndReq() {
+        super();
+    }
+
+    public UpdateMarkWorkExamDataEndReq(Long workId, Long examId) {
+        super();
+        this.workId = workId;
+        this.examId = examId;
+    }
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+}

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/GetMarkWorkExamResp.java

@@ -0,0 +1,22 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import cn.com.qmth.examcloud.marking.api.bean.MarkWorkExamBean;
+
+public class GetMarkWorkExamResp extends BaseResponse {
+
+    private static final long serialVersionUID = 6101833806539265492L;
+
+    private List<MarkWorkExamBean> data;
+
+    public List<MarkWorkExamBean> getData() {
+        return data;
+    }
+
+    public void setData(List<MarkWorkExamBean> data) {
+        this.data = data;
+    }
+
+}

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/UpdateMarkWorkExamDataEndResp.java

@@ -0,0 +1,9 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+
+public class UpdateMarkWorkExamDataEndResp extends BaseResponse {
+
+    private static final long serialVersionUID = 1741258511357718601L;
+
+}

examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordForMarkingCloudServiceClient.java

@@ -1,55 +1,60 @@
-package cn.com.qmth.examcloud.core.oe.admin.client;
-
-import cn.com.qmth.examcloud.core.oe.admin.api.request.*;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSingleExamRecordDataResp;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordForMarkingCloudService;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamRecordForMarkingInfoResp;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoPageResp;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoResp;
-
-@Service
-public class ExamRecordForMarkingCloudServiceClient extends AbstractCloudClientSupport
-        implements ExamRecordForMarkingCloudService {
-
-    private static final long serialVersionUID = 2457700818728109540L;
-
-    @Override
-    public FindExamRecordForMarkingInfoResp findExamRecordForMarkingInfo(
-            FindExamRecordForMarkingInfoReq findExamRecordForMarkingInfoReq) {
-        return post("examRecordForMarking/findExamRecordForMarkingInfo", findExamRecordForMarkingInfoReq,
-                FindExamRecordForMarkingInfoResp.class);
-    }
-
-    @Override
-    public QueryValidExamRecordInfoResp queryValidExamRecordInfo(QueryValidExamRecordInfoReq req) {
-        return post("examRecordForMarking/queryValidExamRecordInfo", req, QueryValidExamRecordInfoResp.class);
-    }
-
-    @Override
-    public QueryValidExamRecordInfoPageResp queryValidExamRecordInfoPage(QueryValidExamRecordInfoPageReq req) {
-        return post("examRecordForMarking/queryValidExamRecordInfoPage", req, QueryValidExamRecordInfoPageResp.class);
-    }
-
-    @Override
-    public GetSingleExamRecordDataResp getSingleExamRecordData(GetSingleExamRecordDataReq req) {
-        return post("examRecordForMarking/getSingleExamRecordData", req, GetSingleExamRecordDataResp.class);
-    }
-
-    /**
-     * 更新阅卷原始数据表批次号
-     *
-     * @param req
-     */
-    @Override
-    public void updateExamRecordForMarkingBatchNum(UpdateExamRecordForMarkingBatchNumReq req) {
-        post("examRecordForMarking/updateExamRecordForMarkingBatchNum", req);
-    }
-
-    @Override
-    public void saveExamRecordForMarking(SaveExamRecordForMarkingReq req) {
-        post("examRecordForMarking/saveExamRecordForMarking", req);
-    }
-
-}
+package cn.com.qmth.examcloud.core.oe.admin.client;
+
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordForMarkingCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamRecordForMarkingInfoReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetSingleExamRecordDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryValidExamRecordInfoPageReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryValidExamRecordInfoReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveExamRecordForMarkingReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.UpdateExamRecordForMarkingBatchNumReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamRecordForMarkingInfoResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSingleExamRecordDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoPageResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoResp;
+
+@Service
+public class ExamRecordForMarkingCloudServiceClient extends AbstractCloudClientSupport
+        implements ExamRecordForMarkingCloudService {
+
+    private static final long serialVersionUID = 2457700818728109540L;
+
+    @Override
+    public FindExamRecordForMarkingInfoResp findExamRecordForMarkingInfo(
+            FindExamRecordForMarkingInfoReq findExamRecordForMarkingInfoReq) {
+        return post("examRecordForMarking/findExamRecordForMarkingInfo", findExamRecordForMarkingInfoReq,
+                FindExamRecordForMarkingInfoResp.class);
+    }
+
+    @Override
+    public QueryValidExamRecordInfoResp queryValidExamRecordInfo(QueryValidExamRecordInfoReq req) {
+        return post("examRecordForMarking/queryValidExamRecordInfo", req, QueryValidExamRecordInfoResp.class);
+    }
+
+    @Override
+    public QueryValidExamRecordInfoPageResp queryValidExamRecordInfoPage(QueryValidExamRecordInfoPageReq req) {
+        return post("examRecordForMarking/queryValidExamRecordInfoPage", req, QueryValidExamRecordInfoPageResp.class);
+    }
+
+    @Override
+    public GetSingleExamRecordDataResp getSingleExamRecordData(GetSingleExamRecordDataReq req) {
+        return post("examRecordForMarking/getSingleExamRecordData", req, GetSingleExamRecordDataResp.class);
+    }
+
+    /**
+     * 更新阅卷原始数据表批次号
+     *
+     * @param req
+     */
+    @Override
+    public void updateExamRecordForMarkingBatchNum(UpdateExamRecordForMarkingBatchNumReq req) {
+        post("examRecordForMarking/updateExamRecordForMarkingBatchNum", req);
+    }
+
+    @Override
+    public void saveExamRecordForMarking(SaveExamRecordForMarkingReq req) {
+        post("examRecordForMarking/saveExamRecordForMarking", req);
+    }
+
+}

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

@@ -1,47 +1,58 @@
-package cn.com.qmth.examcloud.core.oe.admin.api;
-
-
-import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.core.oe.admin.api.request.*;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamRecordForMarkingInfoResp;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSingleExamRecordDataResp;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoPageResp;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoResp;
-
-public interface ExamRecordForMarkingCloudService extends CloudService{
-
-	/**
-	 * 获取试卷信息
-	 * @param findExamRecordForMarkingInfoReq
-	 * @return
-	 */
-	public FindExamRecordForMarkingInfoResp findExamRecordForMarkingInfo(FindExamRecordForMarkingInfoReq findExamRecordForMarkingInfoReq);
-	
-	/**
-	 * 获取学生有效考试记录
-	 * @param req
-	 * @return
-	 */
-	public QueryValidExamRecordInfoResp queryValidExamRecordInfo(QueryValidExamRecordInfoReq req);
-	/**
-	 * 分页获取学生有效考试记录
-	 * @param req
-	 * @return
-	 */
-	public QueryValidExamRecordInfoPageResp queryValidExamRecordInfoPage(QueryValidExamRecordInfoPageReq req);
-
-	/**
-	 * 获取单个考试记录信息
-	 * @param req
-	 * @return
-	 */
-	public GetSingleExamRecordDataResp getSingleExamRecordData(GetSingleExamRecordDataReq req);
-
-	/**
-	 * 更新阅卷原始数据表批次号
-	 * @param req
-	 */
-	public void updateExamRecordForMarkingBatchNum(UpdateExamRecordForMarkingBatchNumReq req);
-	
-	public void saveExamRecordForMarking(SaveExamRecordForMarkingReq req);
-}
+package cn.com.qmth.examcloud.core.oe.admin.api;
+
+import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamRecordForMarkingInfoReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetSingleExamRecordDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryValidExamRecordInfoPageReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryValidExamRecordInfoReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveExamRecordForMarkingReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.UpdateExamRecordForMarkingBatchNumReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamRecordForMarkingInfoResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSingleExamRecordDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoPageResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoResp;
+
+public interface ExamRecordForMarkingCloudService extends CloudService {
+
+    /**
+     * 获取试卷信息
+     * 
+     * @param findExamRecordForMarkingInfoReq
+     * @return
+     */
+    public FindExamRecordForMarkingInfoResp findExamRecordForMarkingInfo(
+            FindExamRecordForMarkingInfoReq findExamRecordForMarkingInfoReq);
+
+    /**
+     * 获取学生有效考试记录
+     * 
+     * @param req
+     * @return
+     */
+    public QueryValidExamRecordInfoResp queryValidExamRecordInfo(QueryValidExamRecordInfoReq req);
+
+    /**
+     * 分页获取学生有效考试记录
+     * 
+     * @param req
+     * @return
+     */
+    public QueryValidExamRecordInfoPageResp queryValidExamRecordInfoPage(QueryValidExamRecordInfoPageReq req);
+
+    /**
+     * 获取单个考试记录信息
+     * 
+     * @param req
+     * @return
+     */
+    public GetSingleExamRecordDataResp getSingleExamRecordData(GetSingleExamRecordDataReq req);
+
+    /**
+     * 更新阅卷原始数据表批次号
+     * 
+     * @param req
+     */
+    public void updateExamRecordForMarkingBatchNum(UpdateExamRecordForMarkingBatchNumReq req);
+
+    public void saveExamRecordForMarking(SaveExamRecordForMarkingReq req);
+}

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/ExtractConfigCloudServiceClient.java

@@ -1,78 +1,83 @@
-package cn.com.qmth.examcloud.core.questions.api.client;
-
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.core.questions.api.ExtractConfigCloudService;
-import cn.com.qmth.examcloud.core.questions.api.request.GetBasePaperReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionAnswerReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetRandomPaperReq;
-import cn.com.qmth.examcloud.core.questions.api.request.SaveRandomPaperExtractConfigReq;
-import cn.com.qmth.examcloud.core.questions.api.response.GetBasePaperResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionAnswerResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionListResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetRandomPaperResp;
-import cn.com.qmth.examcloud.core.questions.api.response.SaveRandomPaperExtractConfigResp;
-
-/**
- * @author weiwenhai
- * @date 2018.8.15
- * @company qmth
- * @description 调卷远程调用服务
- */
-@Service
-public class ExtractConfigCloudServiceClient extends AbstractCloudClientSupport
-		implements
-			ExtractConfigCloudService {
-
-	private static final long serialVersionUID = 5635276170773870907L;
-
-	@Override
-	public GetPaperResp getPaper(GetPaperReq req) {
-		return post("extract_config/getPaper", req, GetPaperResp.class);
-	}
-
-	@Override
-	public GetQuestionResp getQuestion(GetQuestionReq req) {
-		return post("extract_config/getQuestion", req, GetQuestionResp.class);
-	}
-
-	@Override
-	public GetBasePaperResp getBasePaper(GetBasePaperReq req) {
-		return post("extract_config/getBasePaper", req, GetBasePaperResp.class);
-	}
-
-	@Override
-	public GetQuestionListResp getQuestionList(GetQuestionListReq req) {
-		return post("extract_config/getQuestionList", req, GetQuestionListResp.class);
-	}
-
-	@Override
-	public GetQuestionAnswerResp getQuestionAnswer(GetQuestionAnswerReq req) {
-		return post("extract_config/getQuestionAnswerList", req, GetQuestionAnswerResp.class);
-	}
-
-	@Override
-	public GetQuestionResp getBaseQuestion(GetQuestionReq req) {
-		return post("extract_config/getBaseQuestion", req, GetQuestionResp.class);
-	}
-
-	@Override
-	public GetQuestionListResp getQuestionStructure(GetBasePaperReq req) {
-		return post("extract_config/getQuestionStructure", req, GetQuestionListResp.class);
-	}
-
-	@Override
-	public GetRandomPaperResp getRandomPaper(GetRandomPaperReq req) {
-		return post("extract_config/randompaper", req, GetRandomPaperResp.class);
-	}
-
-	@Override
-	public SaveRandomPaperExtractConfigResp saveRandomPaperExtractConfig(SaveRandomPaperExtractConfigReq req) {
-		return post("extract_config/randompaper/save", req, SaveRandomPaperExtractConfigResp.class);
-	}
-}
+package cn.com.qmth.examcloud.core.questions.api.client;
+
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.core.questions.api.ExtractConfigCloudService;
+import cn.com.qmth.examcloud.core.questions.api.request.GetBasePaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigBeanReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionAnswerReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetRandomPaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.SaveRandomPaperExtractConfigReq;
+import cn.com.qmth.examcloud.core.questions.api.response.GetBasePaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetExtractConfigBeanResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionAnswerResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionListResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetRandomPaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.SaveRandomPaperExtractConfigResp;
+
+/**
+ * @author weiwenhai
+ * @date 2018.8.15
+ * @company qmth
+ * @description 调卷远程调用服务
+ */
+@Service
+public class ExtractConfigCloudServiceClient extends AbstractCloudClientSupport implements ExtractConfigCloudService {
+
+    private static final long serialVersionUID = 5635276170773870907L;
+
+    @Override
+    public GetPaperResp getPaper(GetPaperReq req) {
+        return post("extract_config/getPaper", req, GetPaperResp.class);
+    }
+
+    @Override
+    public GetQuestionResp getQuestion(GetQuestionReq req) {
+        return post("extract_config/getQuestion", req, GetQuestionResp.class);
+    }
+
+    @Override
+    public GetBasePaperResp getBasePaper(GetBasePaperReq req) {
+        return post("extract_config/getBasePaper", req, GetBasePaperResp.class);
+    }
+
+    @Override
+    public GetQuestionListResp getQuestionList(GetQuestionListReq req) {
+        return post("extract_config/getQuestionList", req, GetQuestionListResp.class);
+    }
+
+    @Override
+    public GetQuestionAnswerResp getQuestionAnswer(GetQuestionAnswerReq req) {
+        return post("extract_config/getQuestionAnswerList", req, GetQuestionAnswerResp.class);
+    }
+
+    @Override
+    public GetQuestionResp getBaseQuestion(GetQuestionReq req) {
+        return post("extract_config/getBaseQuestion", req, GetQuestionResp.class);
+    }
+
+    @Override
+    public GetQuestionListResp getQuestionStructure(GetBasePaperReq req) {
+        return post("extract_config/getQuestionStructure", req, GetQuestionListResp.class);
+    }
+
+    @Override
+    public GetRandomPaperResp getRandomPaper(GetRandomPaperReq req) {
+        return post("extract_config/randompaper", req, GetRandomPaperResp.class);
+    }
+
+    @Override
+    public SaveRandomPaperExtractConfigResp saveRandomPaperExtractConfig(SaveRandomPaperExtractConfigReq req) {
+        return post("extract_config/randompaper/save", req, SaveRandomPaperExtractConfigResp.class);
+    }
+
+    @Override
+    public GetExtractConfigBeanResp getExtractConfigBean(GetExtractConfigBeanReq req) {
+        return post("extract_config/getExtractConfigBean", req, GetExtractConfigBeanResp.class);
+    }
+}

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExtractConfigCloudService.java

@@ -1,85 +1,97 @@
-package cn.com.qmth.examcloud.core.questions.api;
-
-import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.core.questions.api.request.GetBasePaperReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionAnswerReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
-import cn.com.qmth.examcloud.core.questions.api.request.GetRandomPaperReq;
-import cn.com.qmth.examcloud.core.questions.api.request.SaveRandomPaperExtractConfigReq;
-import cn.com.qmth.examcloud.core.questions.api.response.GetBasePaperResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionAnswerResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionListResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
-import cn.com.qmth.examcloud.core.questions.api.response.GetRandomPaperResp;
-import cn.com.qmth.examcloud.core.questions.api.response.SaveRandomPaperExtractConfigResp;
-
-/**
- * @author 		weiwenhai
- * @date 		2018.8.15
- * @company		qmth
- * @describle	调卷规则远程调用请求接口
- */
-public interface ExtractConfigCloudService extends CloudService{
-
-	/**
-	 * 网考  根据调卷规则  抽取考试试卷
-	 * @param req
-	 * @return
-	 */
-	GetPaperResp getPaper(GetPaperReq req);
-	
-	/**
-	 * 网考  根据调卷规则  抽取单个试题
-	 * @param req
-	 * @return
-	 */
-	GetQuestionResp getQuestion(GetQuestionReq req);
-	
-	/**
-	 * 网考  根据试卷id 抽取考试试卷
-	 * @param req
-	 * @return
-	 */
-	GetBasePaperResp getBasePaper(GetBasePaperReq req);
-	
-	/**
-	 * 根据试题id集合获取试题对象
-	 * @param req
-	 * @return
-	 */
-	GetQuestionListResp getQuestionList(GetQuestionListReq req);
-	
-	/**
-	 * 根据试题id获取试题答案
-	 * @param req
-	 * @return
-	 */
-	GetQuestionAnswerResp getQuestionAnswer(GetQuestionAnswerReq req);
-	
-	/**
-	 * 根据试题id查询单个题目
-	 * @param req
-	 * @return
-	 */
-	GetQuestionResp getBaseQuestion(GetQuestionReq req);
-	
-	/**
-	 * 根据试卷id查询主观题与客观题数量
-	 * @param req
-	 * @return
-	 */
-	GetQuestionListResp getQuestionStructure(GetBasePaperReq req);
-	
-	
-	/**随机抽卷模式获取试卷
-	 * @param req
-	 * @return
-	 */
-	GetRandomPaperResp getRandomPaper(GetRandomPaperReq req);
-	
-	SaveRandomPaperExtractConfigResp saveRandomPaperExtractConfig(SaveRandomPaperExtractConfigReq req);
-	
-}
+package cn.com.qmth.examcloud.core.questions.api;
+
+import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.core.questions.api.request.GetBasePaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigBeanReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionAnswerReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetRandomPaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.SaveRandomPaperExtractConfigReq;
+import cn.com.qmth.examcloud.core.questions.api.response.GetBasePaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetExtractConfigBeanResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionAnswerResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionListResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetRandomPaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.SaveRandomPaperExtractConfigResp;
+
+/**
+ * @author weiwenhai
+ * @date 2018.8.15
+ * @company qmth
+ * @describle 调卷规则远程调用请求接口
+ */
+public interface ExtractConfigCloudService extends CloudService {
+
+    /**
+     * 网考 根据调卷规则 抽取考试试卷
+     * 
+     * @param req
+     * @return
+     */
+    GetPaperResp getPaper(GetPaperReq req);
+
+    /**
+     * 网考 根据调卷规则 抽取单个试题
+     * 
+     * @param req
+     * @return
+     */
+    GetQuestionResp getQuestion(GetQuestionReq req);
+
+    /**
+     * 网考 根据试卷id 抽取考试试卷
+     * 
+     * @param req
+     * @return
+     */
+    GetBasePaperResp getBasePaper(GetBasePaperReq req);
+
+    /**
+     * 根据试题id集合获取试题对象
+     * 
+     * @param req
+     * @return
+     */
+    GetQuestionListResp getQuestionList(GetQuestionListReq req);
+
+    /**
+     * 根据试题id获取试题答案
+     * 
+     * @param req
+     * @return
+     */
+    GetQuestionAnswerResp getQuestionAnswer(GetQuestionAnswerReq req);
+
+    /**
+     * 根据试题id查询单个题目
+     * 
+     * @param req
+     * @return
+     */
+    GetQuestionResp getBaseQuestion(GetQuestionReq req);
+
+    /**
+     * 根据试卷id查询主观题与客观题数量
+     * 
+     * @param req
+     * @return
+     */
+    GetQuestionListResp getQuestionStructure(GetBasePaperReq req);
+
+    /**
+     * 随机抽卷模式获取试卷
+     * 
+     * @param req
+     * @return
+     */
+    GetRandomPaperResp getRandomPaper(GetRandomPaperReq req);
+
+    SaveRandomPaperExtractConfigResp saveRandomPaperExtractConfig(SaveRandomPaperExtractConfigReq req);
+
+    GetExtractConfigBeanResp getExtractConfigBean(GetExtractConfigBeanReq req);
+
+}

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/bean/ExtractConfigBean.java

@@ -0,0 +1,126 @@
+package cn.com.qmth.examcloud.core.questions.api.bean;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.api.commons.enums.CallType;
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+public class ExtractConfigBean implements JsonSerializable {
+
+    private static final long serialVersionUID = 6309635978462557320L;
+
+    /**
+     * ID
+     */
+    protected String id;
+
+    private CallType callType;
+
+    /**
+     * 考试ID
+     */
+    private Long examId;
+
+    /**
+     * 课程代码
+     */
+    private String courseCode;
+
+    /**
+     * 抽取试卷对象集合
+     */
+    private List<ExtractConfigDetailBean> details;
+
+    /**
+     * 是否小题乱序
+     */
+    Boolean sortQuestionOrder;
+
+    /**
+     * 是否选项乱序
+     */
+    Boolean sortOptionOrder;
+
+    /**
+     * 抽卷模板id
+     */
+    private String randomPaperId;
+
+    /**
+     * 播放次数限制
+     */
+    private Integer playTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public List<ExtractConfigDetailBean> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<ExtractConfigDetailBean> details) {
+        this.details = details;
+    }
+
+    public Boolean getSortQuestionOrder() {
+        return sortQuestionOrder;
+    }
+
+    public void setSortQuestionOrder(Boolean sortQuestionOrder) {
+        this.sortQuestionOrder = sortQuestionOrder;
+    }
+
+    public Boolean getSortOptionOrder() {
+        return sortOptionOrder;
+    }
+
+    public void setSortOptionOrder(Boolean sortOptionOrder) {
+        this.sortOptionOrder = sortOptionOrder;
+    }
+
+    public String getRandomPaperId() {
+        return randomPaperId;
+    }
+
+    public void setRandomPaperId(String randomPaperId) {
+        this.randomPaperId = randomPaperId;
+    }
+
+    public Integer getPlayTime() {
+        return playTime;
+    }
+
+    public void setPlayTime(Integer playTime) {
+        this.playTime = playTime;
+    }
+
+    public CallType getCallType() {
+        return callType;
+    }
+
+    public void setCallType(CallType callType) {
+        this.callType = callType;
+    }
+
+}

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/bean/ExtractConfigDetailBean.java

@@ -0,0 +1,58 @@
+package cn.com.qmth.examcloud.core.questions.api.bean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+public class ExtractConfigDetailBean implements JsonSerializable {
+
+    private static final long serialVersionUID = 6309635978462557320L;
+
+    /**
+     * 试卷类型
+     */
+    private String groupCode;
+
+    /**
+     * 关联试卷
+     */
+    private String paperId;
+
+    /**
+     * 抽取权重比例 整数类型 例如：70% 数据库里存70
+     */
+    private Integer weight;
+
+    public ExtractConfigDetailBean() {
+
+    }
+
+    public ExtractConfigDetailBean(String groupCode, String paperId, Integer weight) {
+        this.groupCode = groupCode;
+        this.paperId = paperId;
+        this.weight = weight;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getPaperId() {
+        return paperId;
+    }
+
+    public void setPaperId(String paperId) {
+        this.paperId = paperId;
+    }
+
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Integer weight) {
+        this.weight = weight;
+    }
+
+}

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/request/GetExtractConfigBeanReq.java

@@ -0,0 +1,19 @@
+package cn.com.qmth.examcloud.core.questions.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class GetExtractConfigBeanReq extends BaseRequest {
+
+    private static final long serialVersionUID = 6672726322972965826L;
+
+    private Long examId;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+}

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/response/GetExtractConfigBeanResp.java

@@ -0,0 +1,22 @@
+package cn.com.qmth.examcloud.core.questions.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import cn.com.qmth.examcloud.core.questions.api.bean.ExtractConfigBean;
+
+public class GetExtractConfigBeanResp extends BaseResponse {
+
+    private static final long serialVersionUID = 5831902383553781609L;
+
+    private List<ExtractConfigBean> data;
+
+    public List<ExtractConfigBean> getData() {
+        return data;
+    }
+
+    public void setData(List<ExtractConfigBean> data) {
+        this.data = data;
+    }
+
+}