....

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/SwufeExamController.java

@@ -46,10 +46,17 @@ public class SwufeExamController extends ControllerSupport {
 		Long rootOrgId = accessUser.getRootOrgId();
 
 		SaveExamReq saveExamReq = new SaveExamReq();
-		saveExamReq.setBeginTime(DateUtil.parse(examReq.getBeginTime(), DatePatterns.CHINA_DEFAULT));
+		saveExamReq
+				.setBeginTime(DateUtil.parse(examReq.getBeginTime(), DatePatterns.CHINA_DEFAULT));
 		saveExamReq.setDuration(examReq.getDuration());
 		saveExamReq.setEndTime(DateUtil.parse(examReq.getEndTime(), DatePatterns.CHINA_DEFAULT));
 		saveExamReq.setExamType(examReq.getExamType());
+		// code不传时取name当code
+		if (StringUtils.isNotBlank(examReq.getCode())) {
+			saveExamReq.setCode(examReq.getCode());
+		} else {
+			saveExamReq.setCode(examReq.getName());
+		}
 		saveExamReq.setName(examReq.getName());
 		saveExamReq.setRootOrgId(rootOrgId);
 		examCloudService.saveExam(saveExamReq);

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/bean/SwufeCreateExamDomain.java

@@ -18,6 +18,11 @@ public class SwufeCreateExamDomain implements JsonSerializable {
 	 */
 	private Long rootOrgId;
 
+	/**
+	 * 考试编码
+	 */
+	private String code;
+
 	/**
 	 * 考试名称
 	 */
@@ -51,6 +56,14 @@ public class SwufeCreateExamDomain implements JsonSerializable {
 		this.rootOrgId = rootOrgId;
 	}
 
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
 	public String getName() {
 		return name;
 	}

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

@@ -34,8 +34,8 @@ 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.SydxExam;
-import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxExamStudent;
+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.web.support.ControllerSupport;
 
 /**
@@ -71,7 +71,7 @@ public class SydxStudentExamInfoController extends ControllerSupport {
 
 		tranTimes(outerReq);
 
-		SydxExam exam = outerReq.getExam();
+		SydxExamDomain exam = outerReq.getExam();
 
 		User accessUser = getAccessUser();
 		Long rootOrgId = accessUser.getRootOrgId();
@@ -104,12 +104,12 @@ public class SydxStudentExamInfoController extends ControllerSupport {
 		Long examId = resp.getId();
 		ExamBean examBean = resp.getExamBean();
 		String examName = examBean.getName();
-		List<SydxExamStudent> examStudentList = outerReq.getExamStudentList();
+		List<SydxExamStudentDomain> examStudentList = outerReq.getExamStudentList();
 
 		List<Long> examStudentIdList = Lists.newArrayList();
 		List<SydxFailureRecordDomain> failureRecordList = Lists.newArrayList();
 
-		for (SydxExamStudent cur : examStudentList) {
+		for (SydxExamStudentDomain cur : examStudentList) {
 
 			SaveStudentReq saveStudentReq = new SaveStudentReq();
 			saveStudentReq.setIdentityNumber(cur.getIdentityNumber());
@@ -204,7 +204,7 @@ public class SydxStudentExamInfoController extends ControllerSupport {
 	 * @param examStudentImportDTO
 	 */
 	private void tranTimes(SydxImportDomain examStudentImportDTO) {
-		SydxExam exam = examStudentImportDTO.getExam();
+		SydxExamDomain exam = examStudentImportDTO.getExam();
 
 		String beginTime = exam.getBeginTime();
 		if (StringUtils.isNotBlank(beginTime)) {
@@ -220,11 +220,11 @@ public class SydxStudentExamInfoController extends ControllerSupport {
 			exam.setEndTime(endTime);
 		}
 
-		List<SydxExamStudent> examStudentList = examStudentImportDTO.getExamStudentList();
+		List<SydxExamStudentDomain> examStudentList = examStudentImportDTO.getExamStudentList();
 		if (CollectionUtils.isNotEmpty(examStudentList)) {
 
-			for (SydxExamStudent cur : examStudentList) {
-				SydxExam curExam = cur.getExam();
+			for (SydxExamStudentDomain cur : examStudentList) {
+				SydxExamDomain curExam = cur.getExam();
 				if (null == curExam) {
 					continue;
 				}

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxExam.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxExamDomain.java

@@ -9,7 +9,7 @@ import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.exchange.base.enums.MarkingType;
 import cn.com.qmth.examcloud.exchange.base.enums.PracticeType;
 
-public class SydxExam implements Serializable {
+public class SydxExamDomain implements Serializable {
 
 	private static final long serialVersionUID = -1674026406657304645L;
 
@@ -523,6 +523,6 @@ public class SydxExam implements Serializable {
 		this.faceVerifyEndMinute = faceVerifyEndMinute;
 	}
 
-	public SydxExam() {
+	public SydxExamDomain() {
 	}
 }

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxExamStudent.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxExamStudentDomain.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean;
 
 import java.io.Serializable;
 
-public class SydxExamStudent implements Serializable {
+public class SydxExamStudentDomain implements Serializable {
 
 	private static final long serialVersionUID = 4647883873040374983L;
 
@@ -10,7 +10,7 @@ public class SydxExamStudent implements Serializable {
 
     private String name;
 
-    private SydxExam exam;
+    private SydxExamDomain exam;
     /**
      * 学校id
      */
@@ -125,7 +125,7 @@ public class SydxExamStudent implements Serializable {
      */
     private Boolean canUpload;
 
-	public SydxExamStudent() {}
+	public SydxExamStudentDomain() {}
 	
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -147,11 +147,11 @@ public class SydxExamStudent implements Serializable {
         this.name = name;
     }
 
-    public SydxExam getExam() {
+    public SydxExamDomain getExam() {
         return exam;
     }
 
-    public void setExam(SydxExam exam) {
+    public void setExam(SydxExamDomain exam) {
         this.exam = exam;
     }
 

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxImportDomain.java

@@ -11,23 +11,23 @@ public class SydxImportDomain implements JsonSerializable {
 
 	private static final long serialVersionUID = 7067803176577343830L;
 
-	private SydxExam exam;
+	private SydxExamDomain exam;
 
-	private List<SydxExamStudent> examStudentList;
+	private List<SydxExamStudentDomain> examStudentList;
 
-	public SydxExam getExam() {
+	public SydxExamDomain getExam() {
 		return exam;
 	}
 
-	public void setExam(SydxExam exam) {
+	public void setExam(SydxExamDomain exam) {
 		this.exam = exam;
 	}
 
-	public List<SydxExamStudent> getExamStudentList() {
+	public List<SydxExamStudentDomain> getExamStudentList() {
 		return examStudentList;
 	}
 
-	public void setExamStudentList(List<SydxExamStudent> examStudentList) {
+	public void setExamStudentList(List<SydxExamStudentDomain> examStudentList) {
 		this.examStudentList = examStudentList;
 	}
 }