Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-rmi.git

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

@@ -9,8 +9,6 @@ public class QueryCapturePhotoBean implements JsonSerializable{
 	 */
 	private static final long serialVersionUID = 291850328247014762L;
 
-	private Long examRecordDataId;
-   
     private String fileUrl;
     
     private Boolean isPass;
@@ -19,12 +17,6 @@ public class QueryCapturePhotoBean implements JsonSerializable{
     
     private Boolean isLivenessPass;
 	
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
 	public String getFileUrl() {
 		return fileUrl;
 	}

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

@@ -9,6 +9,8 @@ public class DeleteExamScoreQueueReq extends BaseRequest{
 	 */
 	private static final long serialVersionUID = -3963300713882349016L;
 
+	private Long rootOrgId;
+	
 	private Long queueId;
 
 	public Long getQueueId() {
@@ -18,5 +20,13 @@ public class DeleteExamScoreQueueReq extends BaseRequest{
 	public void setQueueId(Long queueId) {
 		this.queueId = queueId;
 	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
 	
 }

examcloud-core-print-api/src/main/java/cn/com/qmth/examcloud/core/print/api/bean/SyncCoursePaperBean.java

@@ -47,14 +47,6 @@ public class SyncCoursePaperBean implements JsonSerializable {
      * 试卷P数(1P为1面，1张纸为2P)
      */
     private Integer paperP;
-    /**
-     * 试卷Word文件地址
-     */
-    private String paperWordUrl;
-    /**
-     * 答案Word文件地址
-     */
-    private String answerWordUrl;
     /**
      * 试卷页面地址
      */
@@ -63,6 +55,14 @@ public class SyncCoursePaperBean implements JsonSerializable {
      * 试卷PDF文件地址
      */
     private String paperPdfUrl;
+    /**
+     * 答案页面地址
+     */
+    private String answerHtmlUrl;
+    /**
+     * 答案PDF文件地址
+     */
+    private String answerPdfUrl;
 
     public Long getOrgId() {
         return orgId;
@@ -128,22 +128,6 @@ public class SyncCoursePaperBean implements JsonSerializable {
         this.paperP = paperP;
     }
 
-    public String getPaperWordUrl() {
-        return paperWordUrl;
-    }
-
-    public void setPaperWordUrl(String paperWordUrl) {
-        this.paperWordUrl = paperWordUrl;
-    }
-
-    public String getAnswerWordUrl() {
-        return answerWordUrl;
-    }
-
-    public void setAnswerWordUrl(String answerWordUrl) {
-        this.answerWordUrl = answerWordUrl;
-    }
-
     public String getPaperHtmlUrl() {
         return paperHtmlUrl;
     }
@@ -160,4 +144,20 @@ public class SyncCoursePaperBean implements JsonSerializable {
         this.paperPdfUrl = paperPdfUrl;
     }
 
+    public String getAnswerHtmlUrl() {
+        return answerHtmlUrl;
+    }
+
+    public void setAnswerHtmlUrl(String answerHtmlUrl) {
+        this.answerHtmlUrl = answerHtmlUrl;
+    }
+
+    public String getAnswerPdfUrl() {
+        return answerPdfUrl;
+    }
+
+    public void setAnswerPdfUrl(String answerPdfUrl) {
+        this.answerPdfUrl = answerPdfUrl;
+    }
+
 }