阅卷工作选多个考试

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

@@ -3,8 +3,10 @@ package cn.com.qmth.examcloud.marking.api.client;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.marking.api.StudentPaperCloudService;
+import cn.com.qmth.examcloud.marking.api.request.GetBasePaperListReq;
 import cn.com.qmth.examcloud.marking.api.request.GetStudentPaperReq;
 import cn.com.qmth.examcloud.marking.api.request.SaveStudentPaperReq;
+import cn.com.qmth.examcloud.marking.api.response.GetBasePaperListResp;
 import cn.com.qmth.examcloud.marking.api.response.GetStudentPaperResp;
 import cn.com.qmth.examcloud.marking.api.response.SaveStudentPaperResp;
 
@@ -16,19 +18,22 @@ import cn.com.qmth.examcloud.marking.api.response.SaveStudentPaperResp;
  * @Version 3.0
  */
 @Service
-public class StudentPaperCloudServiceClient extends AbstractCloudClientSupport
-		implements
-			StudentPaperCloudService {
+public class StudentPaperCloudServiceClient extends AbstractCloudClientSupport implements StudentPaperCloudService {
 
-	private static final long serialVersionUID = -8711706052966399720L;
+    private static final long serialVersionUID = -8711706052966399720L;
 
-	@Override
-	public GetStudentPaperResp getStudentPaper(GetStudentPaperReq req) {
-		return post("studentPaper/getPaper", req, GetStudentPaperResp.class);
-	}
+    @Override
+    public GetStudentPaperResp getStudentPaper(GetStudentPaperReq req) {
+        return post("studentPaper/getPaper", req, GetStudentPaperResp.class);
+    }
 
-	@Override
-	public SaveStudentPaperResp saveStudentPaper(SaveStudentPaperReq req) {
-		return post("studentPaper/savePaperList", req, SaveStudentPaperResp.class);
-	}
+    @Override
+    public SaveStudentPaperResp saveStudentPaper(SaveStudentPaperReq req) {
+        return post("studentPaper/savePaperList", req, SaveStudentPaperResp.class);
+    }
+
+    @Override
+    public GetBasePaperListResp getBasePaperList(GetBasePaperListReq req) {
+        return post("studentPaper/getBasePaperList", req, GetBasePaperListResp.class);
+    }
 }

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

@@ -1,8 +1,10 @@
 package cn.com.qmth.examcloud.marking.api;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.marking.api.request.GetBasePaperListReq;
 import cn.com.qmth.examcloud.marking.api.request.GetStudentPaperReq;
 import cn.com.qmth.examcloud.marking.api.request.SaveStudentPaperReq;
+import cn.com.qmth.examcloud.marking.api.response.GetBasePaperListResp;
 import cn.com.qmth.examcloud.marking.api.response.GetStudentPaperResp;
 import cn.com.qmth.examcloud.marking.api.response.SaveStudentPaperResp;
 
@@ -14,6 +16,7 @@ import cn.com.qmth.examcloud.marking.api.response.SaveStudentPaperResp;
  * @Version 3.0
  */
 public interface StudentPaperCloudService extends CloudService {
+
     /**
      * 获取下一张待评试卷(或获取指定答卷)
      */
@@ -23,4 +26,6 @@ public interface StudentPaperCloudService extends CloudService {
      * 批量保存考生
      */
     SaveStudentPaperResp saveStudentPaper(SaveStudentPaperReq req);
+
+    GetBasePaperListResp getBasePaperList(GetBasePaperListReq req);
 }

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

@@ -0,0 +1,32 @@
+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;
+
+    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;
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.marking.api.bean;
 
 import java.util.Date;
+import java.util.List;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
@@ -20,7 +21,7 @@ public class MarkWorkBean implements JsonSerializable {
 
     private Date createdOn;
 
-    private String examId;
+    private List<Long> examIds;
 
     private String remark;
 
@@ -42,9 +43,7 @@ public class MarkWorkBean implements JsonSerializable {
 
     private Long userId;
 
-    private String examName;
-
-    private String examType;
+    private List<String> examNameAndType;
 
     private Boolean isEnd;
 
@@ -74,12 +73,12 @@ public class MarkWorkBean implements JsonSerializable {
         this.createdOn = createdOn;
     }
 
-    public String getExamId() {
-        return examId;
+    public List<Long> getExamIds() {
+        return examIds;
     }
 
-    public void setExamId(String examId) {
-        this.examId = examId;
+    public void setExamIds(List<Long> examIds) {
+        this.examIds = examIds;
     }
 
     public String getRemark() {
@@ -162,20 +161,12 @@ public class MarkWorkBean implements JsonSerializable {
         this.userId = userId;
     }
 
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public String getExamType() {
-        return examType;
+    public List<String> getExamNameAndType() {
+        return examNameAndType;
     }
 
-    public void setExamType(String examType) {
-        this.examType = examType;
+    public void setExamNameAndType(List<String> examNameAndType) {
+        this.examNameAndType = examNameAndType;
     }
 
     public MarkWorkBean() {

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

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.marking.api.bean;
 
 import java.util.Date;
+import java.util.List;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
@@ -17,8 +18,6 @@ public class MarkWorkMainBean implements JsonSerializable {
 
     private Date createdOn;
 
-    private String examId;
-
     private String remark;
 
     private int status;
@@ -27,6 +26,8 @@ public class MarkWorkMainBean implements JsonSerializable {
 
     private Long appendTime;
 
+    private List<Long> examIds;
+
     public Long getId() {
         return id;
     }
@@ -51,14 +52,6 @@ public class MarkWorkMainBean implements JsonSerializable {
         this.createdOn = createdOn;
     }
 
-    public String getExamId() {
-        return examId;
-    }
-
-    public void setExamId(String examId) {
-        this.examId = examId;
-    }
-
     public String getRemark() {
         return remark;
     }
@@ -91,4 +84,12 @@ public class MarkWorkMainBean implements JsonSerializable {
         this.appendTime = appendTime;
     }
 
+    public List<Long> getExamIds() {
+        return examIds;
+    }
+
+    public void setExamIds(List<Long> examIds) {
+        this.examIds = examIds;
+    }
+
 }

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

@@ -2,7 +2,6 @@ package cn.com.qmth.examcloud.marking.api.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
-
 /**
  * @ClassName StudentPaperBean
  * @Author nikang
@@ -10,18 +9,24 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @Version 3.0
  */
 public class StudentPaperBean implements JsonSerializable {
+
     private static final long serialVersionUID = 4537371984439448611L;
 
     private Long id;
-    //阅卷ec_oe_exam_record_4_marking主键
+
+    // 阅卷ec_oe_exam_record_4_marking主键
     private Long examRecordMarkingPk;
-    //考生ID
+
+    // 考生ID
     private Long examStudentId;
-    //学生姓名
+
+    // 学生姓名
     private String studentName;
-    //学号
+
+    // 学号
     private String studentCode;
-    //课程名称
+
+    // 课程名称
     private String courseName;
 
     private Long workId;
@@ -30,37 +35,45 @@ public class StudentPaperBean implements JsonSerializable {
 
     private String identityNumber;
 
-    //基础试卷ID
+    // 基础试卷ID
     private String basePaperId;
 
-    //课程Code
+    // 课程Code
     private String courseCode;
 
-    //课程Id
+    // 课程Id
     private Long courseId;
 
-    //考试记录Id
+    // 考试记录Id
     private Long examRecordDataId;
 
-    //客观分
+    // 客观分
     private Double objectiveScore;
 
-    //试卷类型
+    // 试卷类型
     private String paperType;
 
-    //学生专业
+    // 学生专业
     private String specialtyName;
 
     private Double scoreStep;
-    
+
+    private Long examId;
+
+    private String examType;
+
     /**
      * 学生答卷的主观题HTML
      */
     private String studentSubjectiveHtml;
 
-    public StudentPaperBean(){}
+    public StudentPaperBean() {
+    }
 
-    public StudentPaperBean(Long examRecordMarkingPk, Long examStudentId, String studentName, String studentCode, String courseName, Long workId, String orgCode, String identityNumber, String basePaperId, String courseCode, Long courseId, Long examRecordDataId, Double objectiveScore, String paperType, String specialtyName) {
+    public StudentPaperBean(Long examRecordMarkingPk, Long examStudentId, String studentName, String studentCode,
+            String courseName, Long workId, String orgCode, String identityNumber, String basePaperId,
+            String courseCode, Long courseId, Long examRecordDataId, Double objectiveScore, String paperType,
+            String specialtyName) {
         this.examRecordMarkingPk = examRecordMarkingPk;
         this.examStudentId = examStudentId;
         this.studentName = studentName;
@@ -146,7 +159,7 @@ public class StudentPaperBean implements JsonSerializable {
         return basePaperId;
     }
 
-    public void setBasePaperId( String basePaperId) {
+    public void setBasePaperId(String basePaperId) {
         this.basePaperId = basePaperId;
     }
 
@@ -214,8 +227,10 @@ public class StudentPaperBean implements JsonSerializable {
         this.id = id;
     }
 
-    public StudentPaperBean(Long workId, Long examRecordMarkingPk, String basePaperId, Long examStudentId, Long courseId,
-                            String orgCode, Long examRecordId, Double objectiveScore, String paperType, String courseCode, String identityNumber, String studentName, String studentCode, String courseName, String specialtyName) {
+    public StudentPaperBean(Long workId, Long examRecordMarkingPk, String basePaperId, Long examStudentId,
+            Long courseId, String orgCode, Long examRecordId, Double objectiveScore, String paperType,
+            String courseCode, String identityNumber, String studentName, String studentCode, String courseName,
+            String specialtyName) {
         this.examRecordMarkingPk = examRecordMarkingPk;
         this.basePaperId = basePaperId;
         this.examStudentId = examStudentId;
@@ -233,13 +248,28 @@ public class StudentPaperBean implements JsonSerializable {
         this.specialtyName = specialtyName;
     }
 
-	public Double getScoreStep() {
-		return scoreStep;
-	}
+    public Double getScoreStep() {
+        return scoreStep;
+    }
+
+    public void setScoreStep(Double scoreStep) {
+        this.scoreStep = scoreStep;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public String getExamType() {
+        return examType;
+    }
+
+    public void setExamType(String examType) {
+        this.examType = examType;
+    }
 
-	public void setScoreStep(Double scoreStep) {
-		this.scoreStep = scoreStep;
-	}
-    
-    
 }

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

@@ -0,0 +1,32 @@
+package cn.com.qmth.examcloud.marking.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class GetBasePaperListReq extends BaseRequest {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 6786321031898485485L;
+
+    private Long workId;
+
+    private Long courseId;
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+}

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

@@ -23,12 +23,6 @@ public class GetStudentPaperReq extends BaseRequest {
      */
     private Long studentPaperId;
 
-    /**
-     * 考试类型
-     * @return
-     */
-    private String examType;
-
     public Long getMarkTaskId() {
         return markTaskId;
     }
@@ -44,12 +38,4 @@ public class GetStudentPaperReq extends BaseRequest {
     public void setStudentPaperId(Long studentPaperId) {
         this.studentPaperId = studentPaperId;
     }
-
-    public String getExamType() {
-        return examType;
-    }
-
-    public void setExamType(String examType) {
-        this.examType = examType;
-    }
 }

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

@@ -0,0 +1,25 @@
+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.BasePaperBean;
+
+public class GetBasePaperListResp extends BaseResponse {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -7792901445207032499L;
+
+    private List<BasePaperBean> data;
+
+    public List<BasePaperBean> getData() {
+        return data;
+    }
+
+    public void setData(List<BasePaperBean> data) {
+        this.data = data;
+    }
+
+}