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

examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamCloudServiceClient.java

@@ -10,6 +10,7 @@ import cn.com.qmth.examcloud.examwork.api.request.CountExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamCoursePaperTypeListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamOrgListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetOngoingExamListReq;
@@ -21,6 +22,7 @@ import cn.com.qmth.examcloud.examwork.api.response.CountExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamCoursePaperTypeListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamOrgListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetOngoingExamListResp;
@@ -112,4 +114,9 @@ public class ExamCloudServiceClient extends BasicCloudClientSupport implements E
 		return post("exam/countExamStudent", req, CountExamStudentResp.class);
 	}
 
+	@Override
+	public GetExamOrgListResp getExamOrgList(GetExamOrgListReq req) {
+		return post("exam/getExamOrgList", req, GetExamOrgListResp.class);
+	}
+
 }

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

@@ -5,6 +5,7 @@ import cn.com.qmth.examcloud.examwork.api.request.CountExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamCoursePaperTypeListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamOrgListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetOngoingExamListReq;
@@ -16,6 +17,7 @@ import cn.com.qmth.examcloud.examwork.api.response.CountExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamCoursePaperTypeListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamOrgListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetOngoingExamListResp;
@@ -129,4 +131,13 @@ public interface ExamCloudService extends CloudService {
 	 */
 	CountExamStudentResp countExamStudent(CountExamStudentReq req);
 
+	/**
+	 * 获取考试机构列表
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamOrgListResp getExamOrgList(GetExamOrgListReq req);
+
 }

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

@@ -17,8 +17,12 @@ public class CountExamStudentReq extends BaseRequest {
 
 	private Long courseId;
 
+	private Long orgId;
+
 	private String paperType;
 
+	private String examSite;
+
 	public Long getExamId() {
 		return examId;
 	}
@@ -35,6 +39,14 @@ public class CountExamStudentReq extends BaseRequest {
 		this.courseId = courseId;
 	}
 
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
 	public String getPaperType() {
 		return paperType;
 	}
@@ -43,4 +55,12 @@ public class CountExamStudentReq extends BaseRequest {
 		this.paperType = paperType;
 	}
 
+	public String getExamSite() {
+		return examSite;
+	}
+
+	public void setExamSite(String examSite) {
+		this.examSite = examSite;
+	}
+
 }

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

@@ -0,0 +1,16 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年11月27日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetExamOrgListReq extends BaseRequest {
+
+	private static final long serialVersionUID = 4397445992391790395L;
+
+}

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

@@ -0,0 +1,9 @@
+package cn.com.qmth.examcloud.examwork.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class GetExamOrgListResp extends BaseResponse {
+
+	private static final long serialVersionUID = 3231843294954889649L;
+
+}