1111111111111111

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/GetExamRecordAuditInfoServiceProvider.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreDataCloudService;
@@ -25,15 +26,26 @@ import cn.com.qmth.examcloud.exchange.outer.api.response.OuterGetExamRecordAudit
 @RequestMapping("${$rmp.cloud.exchange.outer}/examRecordAuditInfo")
 public class GetExamRecordAuditInfoServiceProvider  extends ControllerSupport implements GetExamRecordAuditInfoService{
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4020820717853946467L;
+	
 	@Autowired
 	private ExamScoreDataCloudService examScoreDataCloudService;
 	
-	@ApiOperation(value = "获取考试记录审核信息", httpMethod = "GET")
+	@ApiOperation(value = "获取考试记录审核信息", httpMethod = "POST")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterGetExamRecordAuditInfoResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
 	@PostMapping("/getExamRecordAuditInfo")
 	@Override
 	public OuterGetExamRecordAuditInfoResp getExamRecordAuditInfo(@RequestBody OuterGetExamRecordAuditInfoReq req) {
+		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+			throw new StatusException("EX-1000001", "rootOrgId is wrong");
+		}
+		if (req.getExamRecordDataId()==null) {
+			throw new StatusException("EX-1000002", "examRecordDataId is null");
+		}
 		GetAuditDataReq getAuditDataReq = new GetAuditDataReq();
 		getAuditDataReq.setExamRecordDataId(req.getExamRecordDataId());
 		GetAuditDataResp auditDataResp = examScoreDataCloudService.getAuditData(getAuditDataReq);

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/GetScoreDataServiceProvider.java

@@ -1,24 +1,35 @@
 package cn.com.qmth.examcloud.exchange.outer.api.provider;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreDataCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.ScoreDataBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetScoreDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryScoreDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetScoreDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryScoreDataResp;
 import cn.com.qmth.examcloud.exchange.outer.api.GetScoreDataService;
+import cn.com.qmth.examcloud.exchange.outer.api.bean.OuterScoreDataBean;
 import cn.com.qmth.examcloud.exchange.outer.api.request.OuterGetScoreDataReq;
+import cn.com.qmth.examcloud.exchange.outer.api.request.OuterQueryScoreDataReq;
 import cn.com.qmth.examcloud.exchange.outer.api.response.OuterGetScoreDataResp;
+import cn.com.qmth.examcloud.exchange.outer.api.response.OuterQueryScoreDataResp;
 
 @Api("获取成绩服务")
 @RestController
@@ -33,31 +44,89 @@ public class GetScoreDataServiceProvider extends ControllerSupport implements Ge
 	@Autowired
 	private ExamScoreDataCloudService examScoreDataCloudService;
 
-	@ApiOperation(value = "获取成绩数据", httpMethod = "GET")
+	@ApiOperation(value = "获取成绩数据", httpMethod = "POST")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterGetScoreDataResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
 	@PostMapping("/getScoreData")
 	@Override
 	public OuterGetScoreDataResp getScoreData(@RequestBody OuterGetScoreDataReq req) {
+		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+			throw new StatusException("EX-1000001", "rootOrgId is wrong");
+		}
+		if (req.getExamRecordDataId()==null) {
+			throw new StatusException("EX-1000002", "examRecordDataId is null");
+		}
 		GetScoreDataReq getScoreDataReq = new GetScoreDataReq();
 		getScoreDataReq.setExamRecordDataId(req.getExamRecordDataId());
 		GetScoreDataResp scoreDataResp = examScoreDataCloudService.getScoreData(getScoreDataReq);
 		
 		OuterGetScoreDataResp outerGetScoreDataResp = new OuterGetScoreDataResp();
-		outerGetScoreDataResp.setExamRecordDataId(scoreDataResp.getExamRecordDataId());
-		outerGetScoreDataResp.setStudentCode(scoreDataResp.getStudentCode());
-		outerGetScoreDataResp.setStudentName(scoreDataResp.getStudentName());
-		outerGetScoreDataResp.setIdentityNumber(scoreDataResp.getIdentityNumber());
-		outerGetScoreDataResp.setCourseCode(scoreDataResp.getCourseCode());
-		outerGetScoreDataResp.setCourseName(scoreDataResp.getCourseName());
-		outerGetScoreDataResp.setStartTime(scoreDataResp.getStartTime());
-		outerGetScoreDataResp.setEndTime(scoreDataResp.getEndTime());
-		outerGetScoreDataResp.setTotalScore(scoreDataResp.getTotalScore());
-		outerGetScoreDataResp.setIsWarn(scoreDataResp.getIsWarn());
-		outerGetScoreDataResp.setIsAudit(scoreDataResp.getIsAudit());
-		outerGetScoreDataResp.setIsIllegality(scoreDataResp.getIsIllegality());
-		
+		OuterScoreDataBean outerScoreDataBean = new OuterScoreDataBean();
+		outerScoreDataBean.setExamRecordDataId(scoreDataResp.getExamRecordDataId());
+		outerScoreDataBean.setStudentCode(scoreDataResp.getStudentCode());
+		outerScoreDataBean.setStudentName(scoreDataResp.getStudentName());
+		outerScoreDataBean.setIdentityNumber(scoreDataResp.getIdentityNumber());
+		outerScoreDataBean.setCourseCode(scoreDataResp.getCourseCode());
+		outerScoreDataBean.setCourseName(scoreDataResp.getCourseName());
+		outerScoreDataBean.setStartTime(scoreDataResp.getStartTime());
+		outerScoreDataBean.setEndTime(scoreDataResp.getEndTime());
+		outerScoreDataBean.setTotalScore(scoreDataResp.getTotalScore());
+		outerScoreDataBean.setIsWarn(scoreDataResp.getIsWarn());
+		outerScoreDataBean.setIsAudit(scoreDataResp.getIsAudit());
+		outerScoreDataBean.setIsIllegality(scoreDataResp.getIsIllegality());
+		outerGetScoreDataResp.setOuterScoreDataBean(outerScoreDataBean);
 		return outerGetScoreDataResp;
 	}
+	
+	@ApiOperation(value = "按考试名称，rootOrgId,courseCode，身份证号或学号获取成绩数据", httpMethod = "POST")
+	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterQueryScoreDataResp.class),
+			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
+	@PostMapping("/queryScoreData")
+	@Override
+	public OuterQueryScoreDataResp queryScoreData(@RequestBody OuterQueryScoreDataReq req) {
+		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+			throw new StatusException("EX-1000001", "rootOrgId is wrong");
+		}
+		if(StringUtils.isBlank(req.getExamName())){
+			throw new StatusException("EX-1000005", "考试名称不能为空");
+		}
+		if(StringUtils.isBlank(req.getCourseCode())){
+			throw new StatusException("EX-1000005", "课程code不能为空");
+		}
+		if(req.getRootOrgId() == null){
+			throw new StatusException("EX-1000005", "rootOrgId不能为空");
+		}
+		if(StringUtils.isBlank(req.getIdentityNumber()) && StringUtils.isBlank(req.getStudentCode())){
+			throw new StatusException("EX-1000005", "身份证号和学号不能都为空");
+		}
+		QueryScoreDataReq queryScoreDataReq = new QueryScoreDataReq();
+		queryScoreDataReq.setCourseCode(req.getCourseCode());
+		queryScoreDataReq.setExamName(req.getExamName());
+		queryScoreDataReq.setIdentityNumber(req.getIdentityNumber());
+		queryScoreDataReq.setRootOrgId(req.getRootOrgId());
+		queryScoreDataReq.setStudentCode(req.getStudentCode());
+		QueryScoreDataResp queryScoreDataResp = examScoreDataCloudService.queryScoreData(queryScoreDataReq);
+		List<ScoreDataBean> scoreDataBeanList = queryScoreDataResp.getScoreDataBeanList();
+		List<OuterScoreDataBean> outerScoreDataBeanList = new ArrayList<OuterScoreDataBean>();
+		for(ScoreDataBean scoreDataBean:scoreDataBeanList){
+			OuterScoreDataBean outerScoreDataBean = new OuterScoreDataBean();
+			outerScoreDataBean.setCourseCode(scoreDataBean.getCourseCode());
+			outerScoreDataBean.setCourseName(scoreDataBean.getCourseName());
+			outerScoreDataBean.setEndTime(scoreDataBean.getEndTime());
+			outerScoreDataBean.setExamRecordDataId(scoreDataBean.getExamRecordDataId());
+			outerScoreDataBean.setIdentityNumber(scoreDataBean.getIdentityNumber());
+			outerScoreDataBean.setIsAudit(scoreDataBean.getIsAudit());
+			outerScoreDataBean.setIsWarn(scoreDataBean.getIsAudit());
+			outerScoreDataBean.setIsIllegality(scoreDataBean.getIsIllegality());
+			outerScoreDataBean.setStartTime(scoreDataBean.getStartTime());
+			outerScoreDataBean.setStudentCode(scoreDataBean.getStudentCode());
+			outerScoreDataBean.setStudentName(scoreDataBean.getStudentName());
+			outerScoreDataBean.setTotalScore(scoreDataBean.getTotalScore());
+			outerScoreDataBeanList.add(outerScoreDataBean);
+		}
+		OuterQueryScoreDataResp outerQueryScoreDataResp = new OuterQueryScoreDataResp();
+		outerQueryScoreDataResp.setOuterScoreDataBeanList(outerScoreDataBeanList);
+		return outerQueryScoreDataResp;
+	}
 
 }

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/QueryCapturePhotoServiceProvider.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreDataCloudService;
@@ -38,12 +39,18 @@ public class QueryCapturePhotoServiceProvider extends ControllerSupport implemen
 	@Autowired
 	private ExamScoreDataCloudService examScoreDataCloudService;
 
-	@ApiOperation(value = "获取抓拍照片信息数据", httpMethod = "GET")
+	@ApiOperation(value = "获取抓拍照片信息数据", httpMethod = "POST")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterQueryCapturePhotoResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
 	@PostMapping("/queryCapturePhoto")
 	@Override
 	public OuterQueryCapturePhotoResp queryCapturePhotoList(@RequestBody OuterQueryCapturePhotoReq req) {
+		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+			throw new StatusException("EX-1000001", "rootOrgId is wrong");
+		}
+		if (req.getExamRecordDataId()==null) {
+			throw new StatusException("EX-1000002", "examRecordDataId is null");
+		}
 		QueryCapturePhotoReq queryCapturePhotoReq = new QueryCapturePhotoReq();
 		queryCapturePhotoReq.setExamRecordDataId(req.getExamRecordDataId());
 		QueryCapturePhotoResp capturePhotoResp = examScoreDataCloudService.queryCapturePhoto(queryCapturePhotoReq);

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ScoreQueueServiceProvider.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreObtainQueueCloudService;
@@ -36,12 +37,15 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
 	@Autowired
 	private ExamScoreObtainQueueCloudService examScoreObtainQueueCloudService;
 
-	@ApiOperation(value = "取队列最顶层记录", httpMethod = "GET")
+	@ApiOperation(value = "取队列最顶层记录", httpMethod = "POST")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterGetScoreQueueTopResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
 	@PostMapping("/getScoreQueueTop")
 	@Override
 	public OuterGetScoreQueueTopResp getScoreQueueTop(@RequestBody OuterGetScoreQueueTopReq req) {
+		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+			throw new StatusException("EX-1000001", "rootOrgId is wrong");
+		}
 		GetTopExamScoreQueueReq getTopExamScoreQueueReq = new GetTopExamScoreQueueReq();
 		getTopExamScoreQueueReq.setRootOrgId(req.getRootOrgId());
 		GetTopExamScoreQueueResp getTopExamScoreQueueResp = examScoreObtainQueueCloudService.getTopExamScoreQueue(getTopExamScoreQueueReq);
@@ -53,12 +57,23 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
 		return resp;
 	}
 
-	@ApiOperation(value = "删除队列最顶层记录", httpMethod = "GET")
+	@ApiOperation(value = "删除队列最顶层记录", httpMethod = "POST")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterDeleteScoreQueueTopResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
 	@PostMapping("/deleteScoreQueueTop")
 	@Override
 	public OuterDeleteScoreQueueTopResp deleteScoreQueueTop(@RequestBody OuterDeleteScoreQueueTopReq req) {
+		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+			throw new StatusException("EX-1000001", "rootOrgId is wrong");
+		}
+		GetTopExamScoreQueueReq getTopExamScoreQueueReq = new GetTopExamScoreQueueReq();
+		getTopExamScoreQueueReq.setRootOrgId(req.getRootOrgId());
+		GetTopExamScoreQueueResp getTopExamScoreQueueResp = examScoreObtainQueueCloudService.getTopExamScoreQueue(getTopExamScoreQueueReq);
+		
+		if(!getTopExamScoreQueueResp.getQueueId().equals(req.getQueueId())){
+			throw new StatusException("EX-1000003", "queueId is wrong");
+		}
+		
 		DeleteExamScoreQueueReq deleteExamScoreQueueReq = new DeleteExamScoreQueueReq();
 		deleteExamScoreQueueReq.setQueueId(req.getQueueId());
 		deleteExamScoreQueueReq.setRootOrgId(req.getRootOrgId());

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/GetScoreDataService.java

@@ -2,7 +2,9 @@ package cn.com.qmth.examcloud.exchange.outer.api;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.OuterService;
 import cn.com.qmth.examcloud.exchange.outer.api.request.OuterGetScoreDataReq;
+import cn.com.qmth.examcloud.exchange.outer.api.request.OuterQueryScoreDataReq;
 import cn.com.qmth.examcloud.exchange.outer.api.response.OuterGetScoreDataResp;
+import cn.com.qmth.examcloud.exchange.outer.api.response.OuterQueryScoreDataResp;
 
 /**
  * 
@@ -15,4 +17,6 @@ public interface GetScoreDataService extends OuterService{
 
 	public OuterGetScoreDataResp getScoreData(OuterGetScoreDataReq req);
 	
+	
+	public OuterQueryScoreDataResp queryScoreData(OuterQueryScoreDataReq req);
 }

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/bean/OuterScoreDataBean.java

@@ -0,0 +1,135 @@
+package cn.com.qmth.examcloud.exchange.outer.api.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年11月27日 下午5:41:09
+ * @company 	QMTH
+ * @description OuterGetScoreDataBean.java
+ */
+@ApiModel(value = "scoreDataBean", description = "考生成绩数据")
+public class OuterScoreDataBean implements JsonSerializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7476060044159007486L;
+
+	@ApiModelProperty(value = "考试记录ID", example = "1", required = true)
+	private Long examRecordDataId;
+	
+	@ApiModelProperty(value = "学生姓名", example = "XX", required = true)
+	private String studentName;
+	
+	@ApiModelProperty(value = "学生学号", example = "X000001", required = true)
+	private String studentCode;
+	
+	@ApiModelProperty(value = "学生身份证号码", example = "10XXXX", required = true)
+	private String identityNumber;
+	
+	@ApiModelProperty(value = "课程名称", example = "语文001", required = true)
+	private String courseName;
+	
+	@ApiModelProperty(value = "课程code", example = "A000001", required = true)
+	private String courseCode;
+	
+	@ApiModelProperty(value = "开考时间", example = "2018-11-16 10:00:00", required = true)
+	private Date startTime;
+	
+	@ApiModelProperty(value = "交卷时间", example = "2018-11-16 10:30:00", required = true)
+	private Date endTime;
+	
+	@ApiModelProperty(value = "得分", example = "100.0", required = true)
+	private Double totalScore;
+	
+	@ApiModelProperty(value = "是否异常数据", example = "false", required = true)
+	private Boolean isWarn;
+	
+	@ApiModelProperty(value = "是否被审核", example = "false", required = true)
+	private Boolean isAudit;
+	
+	@ApiModelProperty(value = "是否违纪", example = "false", required = true)
+	private Boolean isIllegality;
+	
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+	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 getIdentityNumber() {
+		return identityNumber;
+	}
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+	public String getCourseName() {
+		return courseName;
+	}
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+	public String getCourseCode() {
+		return courseCode;
+	}
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+	public Date getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+	public Date getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+	public Double getTotalScore() {
+		return totalScore;
+	}
+	public void setTotalScore(Double totalScore) {
+		this.totalScore = totalScore;
+	}
+	public Boolean getIsWarn() {
+		return isWarn;
+	}
+	public void setIsWarn(Boolean isWarn) {
+		this.isWarn = isWarn;
+	}
+	public Boolean getIsAudit() {
+		return isAudit;
+	}
+	public void setIsAudit(Boolean isAudit) {
+		this.isAudit = isAudit;
+	}
+	public Boolean getIsIllegality() {
+		return isIllegality;
+	}
+	public void setIsIllegality(Boolean isIllegality) {
+		this.isIllegality = isIllegality;
+	}
+	
+	
+}

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterDeleteScoreQueueTopReq.java

@@ -18,7 +18,7 @@ public class OuterDeleteScoreQueueTopReq extends BaseRequest{
 	 */
 	private static final long serialVersionUID = 6340573640799250911L;
 	
-	@ApiModelProperty(value = "机构ID", example = "1", required = true)
+	@ApiModelProperty(value = "顶级机构ID", example = "1", required = true)
 	private Long rootOrgId;
 	
 	@ApiModelProperty(value = "队列ID", example = "1", required = true)

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterGetExamRecordAuditInfoReq.java

@@ -10,9 +10,20 @@ public class OuterGetExamRecordAuditInfoReq extends BaseRequest{
 	 */
 	private static final long serialVersionUID = 492449120567501650L;
 	
+	@ApiModelProperty(value = "顶级机构", example = "0", required = true)
+	private Long rootOrgId;
+	
 	@ApiModelProperty(value = "考试记录ID", example = "1", required = true)
 	private Long examRecordDataId;
 
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
 	public Long getExamRecordDataId() {
 		return examRecordDataId;
 	}

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterGetScoreDataReq.java

@@ -17,9 +17,20 @@ public class OuterGetScoreDataReq extends BaseRequest{
 	 */
 	private static final long serialVersionUID = -7514465576897689892L;
 
+	@ApiModelProperty(value = "顶级机构", example = "0", required = true)
+	private Long rootOrgId;
+	
 	@ApiModelProperty(value = "考试记录ID", example = "1", required = true)
 	private Long examRecordDataId;
 
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
 	public Long getExamRecordDataId() {
 		return examRecordDataId;
 	}

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterQueryCapturePhotoReq.java

@@ -17,9 +17,20 @@ public class OuterQueryCapturePhotoReq extends BaseRequest{
 	 */
 	private static final long serialVersionUID = -3913911619514532603L;
 	
+	@ApiModelProperty(value = "顶级机构", example = "0", required = true)
+	private Long rootOrgId;
+	
 	@ApiModelProperty(value = "考试记录ID", example = "1", required = true)
 	private Long examRecordDataId;
 
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
 	public Long getExamRecordDataId() {
 		return examRecordDataId;
 	}

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterQueryScoreDataReq.java

@@ -0,0 +1,69 @@
+package cn.com.qmth.examcloud.exchange.outer.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年11月27日 下午5:51:08
+ * @company 	QMTH
+ * @description OuterQueryScoreDataReq.java
+ */
+public class OuterQueryScoreDataReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5033520077132433253L;
+
+	private String examName;
+	
+	private Long rootOrgId;
+	
+	private String studentCode;
+	
+	private String identityNumber;
+	
+	private String courseCode;
+
+	public String getExamName() {
+		return examName;
+	}
+
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getStudentCode() {
+		return studentCode;
+	}
+
+	public void setStudentCode(String studentCode) {
+		this.studentCode = studentCode;
+	}
+
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
+	public String getCourseCode() {
+		return courseCode;
+	}
+
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+	
+}

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/response/OuterGetScoreDataResp.java

@@ -1,10 +1,7 @@
 package cn.com.qmth.examcloud.exchange.outer.api.response;
 
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.exchange.outer.api.bean.OuterScoreDataBean;
 
 /**
  * 
@@ -20,113 +17,14 @@ public class OuterGetScoreDataResp extends BaseResponse{
 	 */
 	private static final long serialVersionUID = -9186364236466166910L;
 	
-	@ApiModelProperty(value = "考试记录ID", example = "1", required = true)
-	private Long examRecordDataId;
-	
-	@ApiModelProperty(value = "学生姓名", example = "XX", required = true)
-	private String studentName;
-	
-	@ApiModelProperty(value = "学生学号", example = "X000001", required = true)
-	private String studentCode;
-	
-	@ApiModelProperty(value = "学生身份证号码", example = "10XXXX", required = true)
-	private String identityNumber;
-	
-	@ApiModelProperty(value = "课程名称", example = "语文001", required = true)
-	private String courseName;
-	
-	@ApiModelProperty(value = "课程code", example = "A000001", required = true)
-	private String courseCode;
-	
-	@ApiModelProperty(value = "开考时间", example = "2018-11-16 10:00:00", required = true)
-	private Date startTime;
-	
-	@ApiModelProperty(value = "交卷时间", example = "2018-11-16 10:30:00", required = true)
-	private Date endTime;
-	
-	@ApiModelProperty(value = "得分", example = "100.0", required = true)
-	private Double totalScore;
-	
-	@ApiModelProperty(value = "是否异常数据", example = "false", required = true)
-	private Boolean isWarn;
-	
-	@ApiModelProperty(value = "是否被审核", example = "false", required = true)
-	private Boolean isAudit;
-	
-	@ApiModelProperty(value = "是否违纪", example = "false", required = true)
-	private Boolean isIllegality;
-	
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
-	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 getIdentityNumber() {
-		return identityNumber;
-	}
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-	public String getCourseName() {
-		return courseName;
-	}
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-	public String getCourseCode() {
-		return courseCode;
-	}
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-	public Date getStartTime() {
-		return startTime;
-	}
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-	public Date getEndTime() {
-		return endTime;
-	}
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-	public Double getTotalScore() {
-		return totalScore;
-	}
-	public void setTotalScore(Double totalScore) {
-		this.totalScore = totalScore;
-	}
-	public Boolean getIsWarn() {
-		return isWarn;
-	}
-	public void setIsWarn(Boolean isWarn) {
-		this.isWarn = isWarn;
-	}
-	public Boolean getIsAudit() {
-		return isAudit;
-	}
-	public void setIsAudit(Boolean isAudit) {
-		this.isAudit = isAudit;
-	}
-	public Boolean getIsIllegality() {
-		return isIllegality;
+	private OuterScoreDataBean outerScoreDataBean;
+
+	public OuterScoreDataBean getOuterScoreDataBean() {
+		return outerScoreDataBean;
 	}
-	public void setIsIllegality(Boolean isIllegality) {
-		this.isIllegality = isIllegality;
+
+	public void setOuterScoreDataBean(OuterScoreDataBean outerScoreDataBean) {
+		this.outerScoreDataBean = outerScoreDataBean;
 	}
-	
+
 }

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/response/OuterQueryScoreDataResp.java

@@ -0,0 +1,26 @@
+package cn.com.qmth.examcloud.exchange.outer.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.exchange.outer.api.bean.OuterScoreDataBean;
+
+public class OuterQueryScoreDataResp extends BaseResponse{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7651693026235437061L;
+
+	
+	private List<OuterScoreDataBean> outerScoreDataBeanList;
+
+	public List<OuterScoreDataBean> getOuterScoreDataBeanList() {
+		return outerScoreDataBeanList;
+	}
+
+	public void setOuterScoreDataBeanList(List<OuterScoreDataBean> outerScoreDataBeanList) {
+		this.outerScoreDataBeanList = outerScoreDataBeanList;
+	}
+
+}