xiatian il y a 6 ans
Parent
commit
2e805ca485

+ 25 - 20
examcloud-core-oe-admin-api/pom.xml

@@ -1,21 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>examcloud-core-oe-admin-api</artifactId>
-	<packaging>jar</packaging>
-
-	<parent>
-		<groupId>cn.com.qmth.examcloud.rpc</groupId>
-		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-api-commons</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-	</dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>examcloud-core-oe-admin-api</artifactId>
+	<packaging>jar</packaging>
+
+	<parent>
+		<groupId>cn.com.qmth.examcloud.rpc</groupId>
+		<artifactId>examcloud-rpc</artifactId>
+		<version>2019-SNAPSHOT</version>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-api-commons</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+		<dependency>
+            <groupId>cn.com.qmth.examcloud.question</groupId>
+			<artifactId>examcloud-question-commons</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
+	</dependencies>
+
 </project>

+ 84 - 72
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/QuerySubjectiveAnswerBean.java

@@ -1,72 +1,84 @@
-package cn.com.qmth.examcloud.core.oe.admin.api.bean;
-
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-
-public class QuerySubjectiveAnswerBean implements JsonSerializable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7905287270240057925L;
-	/**
-	 * 考试记录Data Id
-	 */
-    private Long examRecordDataId;
-    /**
-     * 大题号
-     */
-    private Integer mainNumber;
-    /**
-     * 原题ID
-     */
-    private String questionId;
-    /**
-     * 在整个试卷中的序号
-     */
-    private Integer order;
-    /**
-     * 考生作答
-     */
-    private String studentAnswer;
-
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
-
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
-
-	public Integer getMainNumber() {
-		return mainNumber;
-	}
-
-	public void setMainNumber(Integer mainNumber) {
-		this.mainNumber = mainNumber;
-	}
-
-	public String getQuestionId() {
-		return questionId;
-	}
-
-	public void setQuestionId(String questionId) {
-		this.questionId = questionId;
-	}
-
-	public Integer getOrder() {
-		return order;
-	}
-
-	public void setOrder(Integer order) {
-		this.order = order;
-	}
-
-	public String getStudentAnswer() {
-		return studentAnswer;
-	}
-
-	public void setStudentAnswer(String studentAnswer) {
-		this.studentAnswer = studentAnswer;
-	}
-    
-}
+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;
+
+public class QuerySubjectiveAnswerBean implements JsonSerializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7905287270240057925L;
+	/**
+	 * 考试记录Data Id
+	 */
+    private Long examRecordDataId;
+    /**
+     * 大题号
+     */
+    private Integer mainNumber;
+    /**
+     * 原题ID
+     */
+    private String questionId;
+    /**
+     * 在整个试卷中的序号
+     */
+    private Integer order;
+    /**
+     * 考生作答
+     */
+    private String studentAnswer;
+    /**
+	 * 题目作答类型
+	 */
+    private AnswerType answerType;
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+
+	public Integer getMainNumber() {
+		return mainNumber;
+	}
+
+	public void setMainNumber(Integer mainNumber) {
+		this.mainNumber = mainNumber;
+	}
+
+	public String getQuestionId() {
+		return questionId;
+	}
+
+	public void setQuestionId(String questionId) {
+		this.questionId = questionId;
+	}
+
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
+	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;
+	}
+    
+}