随考随阅

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

@@ -3,6 +3,7 @@ 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.CreateMarkRangeReq;
 import cn.com.qmth.examcloud.marking.api.request.GetMarkTaskReq;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
 
@@ -23,6 +24,11 @@ public class MarkTaskCloudServiceClient extends AbstractCloudClientSupport imple
         return post("markTask/getMarkTask", req, GetMarkTaskResp.class);
     }
 
+    @Override
+    public void createMarkRange(CreateMarkRangeReq req) {
+        post("markTask/createMarkRange", req);
+    }
+
     // @Override
     // public SaveMarkTaskResp saveMarkTask(SaveMarkTaskReq req) {
     // return post("markTask/saveMarkTask", req, SaveMarkTaskResp.class);

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

@@ -1,22 +1,20 @@
-package cn.com.qmth.examcloud.marking.api;
-
-import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.marking.api.request.SaveMarkItemReq;
-import cn.com.qmth.examcloud.marking.api.request.SaveMarkWorkReq;
-import cn.com.qmth.examcloud.marking.api.response.SaveMarkItemResp;
-import cn.com.qmth.examcloud.marking.api.response.SaveMarkWorkResp;
-
-/**
- * @ClassName MarkItemCloudService
- * @Description TODO
- * @Author nikang
- * @Date 2018/11/27 11:16
- * @Version 3.0
- */
-public interface MarkItemCloudService extends CloudService {
-
-    /**
-     * 批量保存评分项
-     */
-    SaveMarkItemResp saveMarkWork(SaveMarkItemReq req);
-}
+package cn.com.qmth.examcloud.marking.api;
+
+import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.marking.api.request.SaveMarkItemReq;
+import cn.com.qmth.examcloud.marking.api.response.SaveMarkItemResp;
+
+/**
+ * @ClassName MarkItemCloudService
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/27 11:16
+ * @Version 3.0
+ */
+public interface MarkItemCloudService extends CloudService {
+
+    /**
+     * 批量保存评分项
+     */
+    SaveMarkItemResp saveMarkWork(SaveMarkItemReq req);
+}

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

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.marking.api;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.marking.api.request.CreateMarkRangeReq;
 import cn.com.qmth.examcloud.marking.api.request.GetMarkTaskReq;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
 
@@ -27,4 +28,6 @@ public interface MarkTaskCloudService extends CloudService {
      * 更新评卷任务： 后台操作逻辑包括：save,update,delete操作，详情看具体服务
      */
     // UpdateMarkTaskResp updateMarkTask(UpdateMarkTaskReq req);
+
+    void createMarkRange(CreateMarkRangeReq req);
 }

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

@@ -16,19 +16,15 @@ public class BasePaperBean implements JsonSerializable {
     // 一个basePaperId只会有一种值
     private Boolean randomPaper;
 
-    // 一个basePaperId可能对应多个值，在多个考试用同一个试卷时。优先anyTimeMark=true的值
-    private Boolean anyTimeMark;
-
     public BasePaperBean() {
         super();
     }
 
-    public BasePaperBean(String basePaperId, String basePaperName, Boolean randomPaper, Boolean anyTimeMark) {
+    public BasePaperBean(String basePaperId, String basePaperName, Boolean randomPaper) {
         super();
         this.basePaperId = basePaperId;
         this.basePaperName = basePaperName;
         this.randomPaper = randomPaper;
-        this.anyTimeMark = anyTimeMark;
     }
 
     public String getBasePaperId() {
@@ -55,12 +51,4 @@ public class BasePaperBean implements JsonSerializable {
         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/MarkRangeBean.java

@@ -0,0 +1,49 @@
+package cn.com.qmth.examcloud.marking.api.bean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+public class MarkRangeBean implements JsonSerializable {
+
+    private static final long serialVersionUID = -5290322662893858995L;
+
+    private Long workId;
+
+    private Boolean randomPaper;
+
+    private String basePaperId;
+
+    private Long courseId;
+
+    public Boolean getRandomPaper() {
+        return randomPaper;
+    }
+
+    public void setRandomPaper(Boolean randomPaper) {
+        this.randomPaper = randomPaper;
+    }
+
+    public String getBasePaperId() {
+        return basePaperId;
+    }
+
+    public void setBasePaperId(String basePaperId) {
+        this.basePaperId = basePaperId;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    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/CreateMarkRangeReq.java

@@ -0,0 +1,20 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import cn.com.qmth.examcloud.marking.api.bean.MarkRangeBean;
+
+public class CreateMarkRangeReq extends BaseRequest {
+
+    private static final long serialVersionUID = 8360867457944678312L;
+
+    private MarkRangeBean bean;
+
+    public MarkRangeBean getBean() {
+        return bean;
+    }
+
+    public void setBean(MarkRangeBean bean) {
+        this.bean = bean;
+    }
+
+}

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

@@ -1,54 +1,65 @@
-package cn.com.qmth.examcloud.core.oe.admin.api.request;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
-
-public class FindExamRecordForMarkingInfoReq extends BaseRequest{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -5225188075968101471L;
-
-	private Long id;
-	
-	private Long examId;
-	
-	private Long courseId;
-
-	/**
-	 * 批次号
-	 */
-	private String batchNum;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public String getBatchNum() {
-		return batchNum;
-	}
-
-	public void setBatchNum(String batchNum) {
-		this.batchNum = batchNum;
-	}
-}
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class FindExamRecordForMarkingInfoReq extends BaseRequest {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -5225188075968101471L;
+
+    private Long id;
+
+    private Long examId;
+
+    private Long courseId;
+
+    private Boolean includeRandomPaper;
+
+    /**
+     * 批次号
+     */
+    private String batchNum;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getBatchNum() {
+        return batchNum;
+    }
+
+    public void setBatchNum(String batchNum) {
+        this.batchNum = batchNum;
+    }
+
+    public Boolean getIncludeRandomPaper() {
+        return includeRandomPaper;
+    }
+
+    public void setIncludeRandomPaper(Boolean includeRandomPaper) {
+        this.includeRandomPaper = includeRandomPaper;
+    }
+
+}

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

@@ -26,6 +26,8 @@ public class ExtractConfigBean implements JsonSerializable {
      */
     private String courseCode;
 
+    private Long courseId;
+
     /**
      * 抽取试卷对象集合
      */
@@ -123,4 +125,12 @@ public class ExtractConfigBean implements JsonSerializable {
         this.callType = callType;
     }
 
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
 }