WANG преди 6 години
родител
ревизия
653474cfe2

+ 8 - 12
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/StudentExamInfoController.java

@@ -33,7 +33,7 @@ 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.SaveExamStudentResp;
 import cn.com.qmth.examcloud.exchange.base.enums.CourseLevel;
-import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.ExamStudentImportDTO;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.ExamStudentImportRequest;
 import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.FailureRecordDomain;
 import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.OutletExam;
 import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.OutletExamStudent;
@@ -64,16 +64,16 @@ public class StudentExamInfoController extends ControllerSupport {
 	 * 方法注释
 	 *
 	 * @author WANGWEI
-	 * @param examStudentImportDTO
+	 * @param outerReq
 	 * @return
 	 */
 	@ApiOperation(value = "石油大学使用:创建考试和导入学生")
 	@PostMapping
-	public ResponseEntity<?> post(@RequestBody ExamStudentImportDTO examStudentImportDTO) {
+	public ResponseEntity<?> post(@RequestBody ExamStudentImportRequest outerReq) {
 
-		tranTimes(examStudentImportDTO);
+		tranTimes(outerReq);
 
-		OutletExam exam = examStudentImportDTO.getExam();
+		OutletExam exam = outerReq.getExam();
 
 		User accessUser = getAccessUser();
 		Long rootOrgId = accessUser.getRootOrgId();
@@ -107,7 +107,7 @@ public class StudentExamInfoController extends ControllerSupport {
 		Long examId = resp.getId();
 		ExamBean examBean = resp.getExamBean();
 		String examName = examBean.getName();
-		List<OutletExamStudent> examStudentList = examStudentImportDTO.getExamStudentList();
+		List<OutletExamStudent> examStudentList = outerReq.getExamStudentList();
 
 		List<Long> examStudentIdList = Lists.newArrayList();
 		List<FailureRecordDomain> failureRecordList = Lists.newArrayList();
@@ -159,14 +159,10 @@ public class StudentExamInfoController extends ControllerSupport {
 			sReq.setRootOrgId(rootOrgId);
 			sReq.setStudentCode(cur.getStudentCode());
 			sReq.setStudentName(cur.getName());
-			if (StringUtils.isBlank(cur.getPaperType())) {
-				sReq.setPaperType("O");
-			} else {
-				sReq.setPaperType(cur.getPaperType());
-			}
 			sReq.setRemark(cur.getRemark());
 			sReq.setGrade(cur.getGrade());
 			sReq.setInfoCollector(cur.getInfoCollector());
+			sReq.setSpecialtyName(cur.getSpecialtyName());
 
 			try {
 				SaveExamStudentResp savedExamStudent = examStudentCloudService
@@ -209,7 +205,7 @@ public class StudentExamInfoController extends ControllerSupport {
 	 * @author WANGWEI
 	 * @param examStudentImportDTO
 	 */
-	private void tranTimes(ExamStudentImportDTO examStudentImportDTO) {
+	private void tranTimes(ExamStudentImportRequest examStudentImportDTO) {
 		OutletExam exam = examStudentImportDTO.getExam();
 
 		String beginTime = exam.getBeginTime();

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/ExamStudentImportDTO.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/ExamStudentImportRequest.java

@@ -7,7 +7,7 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
 /**
  * Created by yuanpan on 2017/4/25.
  */
-public class ExamStudentImportDTO implements JsonSerializable {
+public class ExamStudentImportRequest implements JsonSerializable {
 
 	private static final long serialVersionUID = 7067803176577343830L;