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

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamPropertyReq.java

@@ -1,39 +1,59 @@
-package cn.com.qmth.examcloud.examwork.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetExamPropertyReq extends BaseRequest {
-
-	private static final long serialVersionUID = -3957501133504335385L;
-
-	private Long examId;
-
-	private Long rootOrgId;
-
-	private String key;
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年8月21日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetExamPropertyReq extends BaseRequest {
+
+	private static final long serialVersionUID = -3957501133504335385L;
+
+	private Long examId;
+
+	private Long rootOrgId;
+
+	private String key;
+
+	/**
+	 * 机构ID(机构属性不为空时覆盖考试属性)
+	 */
+	private Long orgId;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+}

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamReq.java

@@ -12,6 +12,11 @@ public class GetExamReq extends BaseRequest {
 
 	private static final long serialVersionUID = -5832266903859887508L;
 
+	/**
+	 * 考试ID
+	 */
+	private Long id;
+
 	/**
 	 * 机构ID
 	 */
@@ -23,9 +28,9 @@ public class GetExamReq extends BaseRequest {
 	private String name;
 
 	/**
-	 * 考试ID
+	 * 机构ID(机构特殊配置不为空时覆盖考试信息)
 	 */
-	private Long id;
+	private Long orgId;
 
 	public Long getRootOrgId() {
 		return rootOrgId;
@@ -51,4 +56,12 @@ public class GetExamReq extends BaseRequest {
 		this.id = id;
 	}
 
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
 }

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/response/GetExamPropertyResp.java

@@ -1,49 +1,26 @@
-package cn.com.qmth.examcloud.examwork.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class GetExamPropertyResp extends BaseResponse {
-
-	private static final long serialVersionUID = 606999493938772517L;
-
-	private Boolean existing;
-
-	private Long propertyId;
-
-	private String key;
-
-	private String value;
-
-	public Boolean getExisting() {
-		return existing;
-	}
-
-	public void setExisting(Boolean existing) {
-		this.existing = existing;
-	}
-
-	public Long getPropertyId() {
-		return propertyId;
-	}
-
-	public void setPropertyId(Long propertyId) {
-		this.propertyId = propertyId;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年8月21日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetExamPropertyResp extends BaseResponse {
+
+	private static final long serialVersionUID = 606999493938772517L;
+
+	private String value;
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}