重构导出主观题代码

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

@@ -1,14 +1,15 @@
 package cn.com.qmth.examcloud.core.oe.admin.client;
 
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.CheckExamIsStartedReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetExamPhotoVerifyDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetToBeMarkExamRecordReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryExamRecordForSelectScoreReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.CheckExamIsStartedResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetExamPhotoVerifyDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetToBeMarkExamRecordResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamRecordForSelectScoreResp;
+import org.springframework.stereotype.Service;
 
 @Service("examRecordCloudService")
 public class ExamRecordCloudServiceClient extends AbstractCloudClientSupport
@@ -41,4 +42,8 @@ public class ExamRecordCloudServiceClient extends AbstractCloudClientSupport
 		return post("examRecord/getExamPhotoVerifyData", req, GetExamPhotoVerifyDataResp.class);
 	}
 
+	@Override
+	public GetToBeMarkExamRecordResp getToBeMarkExamRecord(GetToBeMarkExamRecordReq req) {
+		return post("examRecord/getToBeMarkExamRecord", req, GetToBeMarkExamRecordResp.class);
+	}
 }

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

@@ -50,4 +50,15 @@ public class OeExamStudentCloudServiceClient extends AbstractCloudClientSupport
 		return post("exam/student/getExamStudentCount", req, GetExamStudentCountResp.class);
 	}
 
+	/**
+	 * 根据查询条件获取所有待阅卷的考生
+	 *
+	 * @param req
+	 * @return
+	 */
+	@Override
+	public GetToBeMarkExamStudentResp getToBeMarkExamStudent(GetToBeMarkExamStudentReq req) {
+		return post("exam/student/getToBeMarkExamStudent", req, GetToBeMarkExamStudentResp.class);
+	}
+
 }

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

@@ -3,9 +3,11 @@ 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.CheckExamIsStartedReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetExamPhotoVerifyDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetToBeMarkExamRecordReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryExamRecordForSelectScoreReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.CheckExamIsStartedResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetExamPhotoVerifyDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetToBeMarkExamRecordResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamRecordForSelectScoreResp;
 
 /**
@@ -43,4 +45,11 @@ public interface ExamRecordCloudService extends CloudService{
 	 * @return
 	 */
 	public GetExamPhotoVerifyDataResp getExamPhotoVerifyData(GetExamPhotoVerifyDataReq req);
+
+	/**
+	 * 获取待阅卷的考试记录
+	 * @param req
+	 * @return
+	 */
+	GetToBeMarkExamRecordResp getToBeMarkExamRecord(GetToBeMarkExamRecordReq req);
 }

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

@@ -49,4 +49,11 @@ public interface OeExamStudentCloudService extends CloudService {
      * @return
      */
     GetExamStudentCountResp getExamStudentCount(GetExamStudentCountReq req);
+
+    /**
+     * 根据查询条件获取所有待阅卷的考生
+     * @param req
+     * @return
+     */
+    GetToBeMarkExamStudentResp getToBeMarkExamStudent(GetToBeMarkExamStudentReq req);
 }

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

@@ -3,7 +3,7 @@ package cn.com.qmth.examcloud.core.oe.admin.api.bean;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 /**
- * @Description TODO
+ * @Description 考生数据bean
  * @Author lideyin
  * @Date 2019/10/15 13:54
  * @Version 1.0

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

@@ -14,21 +14,21 @@ public class SubjectiveAnswerBean implements JsonSerializable{
 	private static final long serialVersionUID = 3292347198033809640L;
 
 	/**
-	 * 考试id
-	 */
-	private Long examId;
-	/**
-	 * 课程代码
-	 */
-	private String courseCode;
-	/**
-	 * 考生id
-	 */
-	private Long examStudentId;
-	/**
-	 * 考试记录Data Id
-	 */
-	private Long examRecordDataId;
+     * 考试id
+     */
+    private Long examId;
+    /**
+     * 课程代码
+     */
+    private String courseCode;
+    /**
+     * 考生id
+     */
+    private Long examStudentId;
+    /**
+     * 考试记录Data Id
+     */
+    private Long examRecordDataId;
     /**
      * 大题号
      */
@@ -46,14 +46,14 @@ public class SubjectiveAnswerBean implements JsonSerializable{
      */
     private String studentAnswer;
     /**
-	 * 题目作答类型
-	 */
+     * 题目作答类型
+     */
     private AnswerType answerType;
 
-	/**
-	 * 真实的题目作答类型（历史原因，图片作答类型未按规范指定）
-	 */
-	private String realAnswerType;
+    /**
+     * 真实的题目作答类型（历史原因，图片作答类型未按规范指定）
+     */
+    private String realAnswerType;
 
 	public Long getExamId() {
 		return examId;

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

@@ -0,0 +1,131 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+import java.util.List;
+
+/**
+ * @Description 待阅卷的考试记录实体
+ * @Author lideyin
+ * @Date 2019/11/22 13:50
+ * @Version 1.0
+ */
+public class ToBeMarkExamRecordBean implements JsonSerializable {
+    private static final long serialVersionUID = 6350778610949208479L;
+    /**
+     * 考试id
+     */
+    private Long examId;
+
+    /**
+     * 考生id
+     */
+    private Long examStudentId;
+
+    /**
+     * 姓名
+     */
+    private String studentName;
+
+    /**
+     * 学号
+     */
+    private String studentCode;
+
+    /**
+     * 课程代码
+     */
+    private String courseCode;
+
+    /**
+     * 课程名称
+     */
+    private String courseName;
+
+    /**
+     * 卷型
+     */
+    private String paperType;
+
+    /**
+     * 考试记录Data Id
+     */
+    private Long examRecordDataId;
+
+    /**
+     * 待阅的主观题集合
+     */
+    private List<ToBeMarkSubjectiveAnswerBean> subjectiveAnswerList;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public Long getExamStudentId() {
+        return examStudentId;
+    }
+
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
+    }
+
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
+    }
+
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
+
+    public List<ToBeMarkSubjectiveAnswerBean> getSubjectiveAnswerList() {
+        return subjectiveAnswerList;
+    }
+
+    public void setSubjectiveAnswerList(List<ToBeMarkSubjectiveAnswerBean> subjectiveAnswerList) {
+        this.subjectiveAnswerList = subjectiveAnswerList;
+    }
+}

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

@@ -0,0 +1,26 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
+/**
+ * @Description 待阅卷的考生数据bean
+ * @Author lideyin
+ * @Date 2019/10/15 13:54
+ * @Version 1.0
+ */
+public class ToBeMarkExamStudentBean implements JsonSerializable {
+
+    private static final long serialVersionUID = 5646217508290508839L;
+    /**
+     * 考试id
+     */
+    private Long examStudentId;
+
+    public Long getExamStudentId() {
+        return examStudentId;
+    }
+
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
+    }
+}

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

@@ -0,0 +1,91 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+import cn.com.qmth.examcloud.question.commons.core.question.AnswerType;
+
+/**
+ * @Description 待阅卷的主观题答案实体bean
+ * @Author lideyin
+ * @Date 2019/11/22 11:47
+ * @Version 1.0
+ */
+public class ToBeMarkSubjectiveAnswerBean implements JsonSerializable{
+
+	private static final long serialVersionUID = 9039765157857806599L;
+    /**
+     * 大题号
+     */
+    private Integer mainNumber;
+
+	/**
+	 * 小题号
+	 */
+	private Integer order;
+
+    /**
+     * 原题ID
+     */
+    private String questionId;
+
+    /**
+     * 考生作答
+     */
+    private String studentAnswer;
+    /**
+     * 题目作答类型
+     */
+    private AnswerType answerType;
+
+    /**
+     * 真实的题目作答类型（历史原因，图片作答类型未按规范指定）
+     */
+    private String realAnswerType;
+
+	public Integer getMainNumber() {
+		return mainNumber;
+	}
+
+	public void setMainNumber(Integer mainNumber) {
+		this.mainNumber = mainNumber;
+	}
+
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
+	public String getQuestionId() {
+		return questionId;
+	}
+
+	public void setQuestionId(String questionId) {
+		this.questionId = questionId;
+	}
+
+	public String getStudentAnswer() {
+		return studentAnswer;
+	}
+
+	public void setStudentAnswer(String studentAnswer) {
+		this.studentAnswer = studentAnswer;
+	}
+
+	public AnswerType getAnswerType() {
+		return answerType;
+	}
+
+	public void setAnswerType(AnswerType answerType) {
+		this.answerType = answerType;
+	}
+
+	public String getRealAnswerType() {
+		return realAnswerType;
+	}
+
+	public void setRealAnswerType(String realAnswerType) {
+		this.realAnswerType = realAnswerType;
+	}
+}

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

@@ -0,0 +1,27 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import java.util.List;
+
+/**
+ * @Description TODO
+ * @Author lideyin
+ * @Date 2019/11/22 13:48
+ * @Version 1.0
+ */
+public class GetToBeMarkExamRecordReq extends BaseRequest {
+    private static final long serialVersionUID = -5522923674102260492L;
+
+    /**
+     * 考生id集合
+     */
+    private List<Long> examStudentIdList;
+
+    public List<Long> getExamStudentIdList() {
+        return examStudentIdList;
+    }
+
+    public void setExamStudentIdList(List<Long> examStudentIdList) {
+        this.examStudentIdList = examStudentIdList;
+    }
+}

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

@@ -0,0 +1,27 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+import java.util.List;
+
+/**
+ * @Description 获取考生数量请求类
+ * @Author lideyin
+ * @Date 2019/10/15 11:29
+ * @Version 1.0
+ */
+public class GetToBeMarkExamStudentReq extends BaseRequest {
+
+	private static final long serialVersionUID = -1283438214265652900L;
+
+	//考试id
+	private Long examId;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+}

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

@@ -0,0 +1,31 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.ToBeMarkExamRecordBean;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.ToBeMarkSubjectiveAnswerBean;
+
+import java.util.List;
+
+/**
+ * @Description 获取待阅卷的考试记录响应类
+ * @Author lideyin
+ * @Date 2019/11/22 11:32
+ * @Version 1.0
+ */
+public class GetToBeMarkExamRecordResp extends BaseResponse {
+
+    private static final long serialVersionUID = 9083389492759528604L;
+
+    /**
+     * 待阅卷的考试记录集合
+     */
+    private List<ToBeMarkExamRecordBean> toBeMarkExamRecordBeanList;
+
+    public List<ToBeMarkExamRecordBean> getToBeMarkExamRecordBeanList() {
+        return toBeMarkExamRecordBeanList;
+    }
+
+    public void setToBeMarkExamRecordBeanList(List<ToBeMarkExamRecordBean> toBeMarkExamRecordBeanList) {
+        this.toBeMarkExamRecordBeanList = toBeMarkExamRecordBeanList;
+    }
+}

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

@@ -0,0 +1,28 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamStudentCountBean;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.ToBeMarkExamStudentBean;
+
+import java.util.List;
+
+/**
+ * @Description 获取待阅卷的考生数量响应类
+ * @Author lideyin
+ * @Date 2019/10/15 11:29
+ * @Version 1.0
+ */
+public class GetToBeMarkExamStudentResp extends BaseResponse{
+
+	private static final long serialVersionUID = -312527882842778030L;
+	//考生集合
+	private List<ToBeMarkExamStudentBean> examStudentList;
+
+	public List<ToBeMarkExamStudentBean> getExamStudentList() {
+		return examStudentList;
+	}
+
+	public void setExamStudentList(List<ToBeMarkExamStudentBean> examStudentList) {
+		this.examStudentList = examStudentList;
+	}
+}