WANG 6 anni fa
parent
commit
d8668b658f

+ 18 - 28
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/SydxStudentExamInfoController.java

@@ -26,16 +26,15 @@ import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
+import cn.com.qmth.examcloud.examwork.api.response.SaveExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 import cn.com.qmth.examcloud.exchange.base.enums.CourseLevel;
-import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxImportDomain;
-import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxFailureRecordDomain;
 import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxExamDomain;
 import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxExamStudentDomain;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxFailureRecordDomain;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxImportDomain;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 
 /**
@@ -76,32 +75,23 @@ public class SydxStudentExamInfoController extends ControllerSupport {
 		User accessUser = getAccessUser();
 		Long rootOrgId = accessUser.getRootOrgId();
 
-		GetExamReq req = new GetExamReq();
-		req.setName(exam.getName());
-		req.setRootOrgId(accessUser.getRootOrgId());
-		GetExamResp resp = null;
-		try {
-			resp = examCloudService.getExam(req);
-		} catch (StatusException e) {
-			if (e.getCode().equals("E-002002")) {
-				SaveExamReq saveExamReq = new SaveExamReq();
-				saveExamReq.setBeginTime(
-						DateUtil.parse(exam.getBeginTime(), DatePatterns.CHINA_DEFAULT));
-				saveExamReq.setDuration(exam.getDuration());
-				saveExamReq
-						.setEndTime(DateUtil.parse(exam.getEndTime(), DatePatterns.CHINA_DEFAULT));
-				saveExamReq.setExamType(exam.getExamType());
-				saveExamReq.setName(exam.getName());
-				saveExamReq.setRemark(exam.getRemark());
-				saveExamReq.setRootOrgId(rootOrgId);
-				examCloudService.saveExam(saveExamReq);
-				resp = examCloudService.getExam(req);
-			} else {
-				throw e;
-			}
+		SaveExamReq saveExamReq = new SaveExamReq();
+		saveExamReq.setBeginTime(DateUtil.parse(exam.getBeginTime(), DatePatterns.CHINA_DEFAULT));
+		saveExamReq.setDuration(exam.getDuration());
+		saveExamReq.setEndTime(DateUtil.parse(exam.getEndTime(), DatePatterns.CHINA_DEFAULT));
+		saveExamReq.setExamType(exam.getExamType());
+		// code不传时取name当code
+		if (StringUtils.isNotBlank(exam.getCode())) {
+			saveExamReq.setCode(exam.getCode());
+		} else {
+			saveExamReq.setCode(exam.getName());
 		}
+		saveExamReq.setName(exam.getName());
+		saveExamReq.setRemark(exam.getRemark());
+		saveExamReq.setRootOrgId(rootOrgId);
+		SaveExamResp resp = examCloudService.saveExam(saveExamReq);
 
-		Long examId = resp.getId();
+		Long examId = resp.getExamId();
 		ExamBean examBean = resp.getExamBean();
 		String examName = examBean.getName();
 		List<SydxExamStudentDomain> examStudentList = outerReq.getExamStudentList();

+ 12 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxExamDomain.java

@@ -15,6 +15,11 @@ public class SydxExamDomain implements Serializable {
 
 	private Long id;
 
+	/**
+	 * 考试编码
+	 */
+	private String code;
+
 	/**
 	 * 机构Id
 	 */
@@ -523,6 +528,12 @@ public class SydxExamDomain implements Serializable {
 		this.faceVerifyEndMinute = faceVerifyEndMinute;
 	}
 
-	public SydxExamDomain() {
+	public String getCode() {
+		return code;
 	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
 }