。。。

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -22,7 +22,6 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -179,7 +178,12 @@ public class ExamController extends ControllerSupport {
 
 	@ApiOperation(value = "新增考试批次", notes = "新增")
 	@PostMapping()
-	public Exam addExam(HttpServletRequest request, @RequestBody Exam exam) {
+	public Exam addExam(@RequestBody Exam exam) {
+		trim(exam);
+
+		if (null == exam.getExamType()) {
+			throw new StatusException("E-001005", "考试类型为空");
+		}
 
 		if (null != exam.getBeforeExamRemark() && exam.getBeforeExamRemark().length() > 250000) {
 			throw new StatusException("E-001002", "考前说明内容过大");
@@ -205,6 +209,12 @@ public class ExamController extends ControllerSupport {
 	@ApiOperation(value = "更新考试批次", notes = "更新")
 	@PutMapping()
 	public Exam updateExam(@RequestBody Exam exam) {
+		trim(exam);
+
+		if (null == exam.getExamType()) {
+			throw new StatusException("E-001005", "考试类型为空");
+		}
+
 		if (!examService.checkExamName(exam)) {
 			throw new StatusException("E-001001", "考试名称已存在,请重新填写");
 		}

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/enums/ExamType.java

@@ -7,23 +7,27 @@ package cn.com.qmth.examcloud.core.examwork.dao.enums;
  * @date 2017年1月5日
  */
 public enum ExamType {
-    /**
-     * 传统
-     */
-    TRADITION,
+	/**
+	 * 传统
+	 */
+	TRADITION,
 
-    /**
-     * 网考
-     */
-    ONLINE,
+	/**
+	 * 网考
+	 */
+	ONLINE,
 
-    /**
-     * 练习
-     */
-    PRACTICE,
+	/**
+	 * 练习
+	 */
+	PRACTICE,
 
-    /**
-     * 离线
-     */
-    OFFLINE
+	/**
+	 * 离线
+	 */
+	OFFLINE,
+	/**
+	 * 分布式印刷考试
+	 */
+	PRINT_EXAM;
 }

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamService.java

@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import cn.com.qmth.examcloud.common.dto.core.Org;
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
+import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamOrgTimeRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
@@ -90,15 +91,11 @@ public class ExamService {
 	 */
 	public Exam saveExam(Exam exam) {
 		Exam newExam = examRepo.save(exam);
-		/*
-		 * if(newExam.getId() != null){ dataSendService.sendExam(newExam); }
-		 */
 		return newExam;
 	}
 
 	@Transactional
-	public Exam insertExam(Exam exam,
-			cn.com.qmth.examcloud.commons.web.security.bean.User accessUser) {
+	public Exam insertExam(Exam exam, User accessUser) {
 		ExamType examType = exam.getExamType();
 		if (examType == ExamType.OFFLINE) {
 			Exam newExam = examRepo.save(exam);
@@ -114,8 +111,7 @@ public class ExamService {
 	 * @param exam
 	 * @param accessUser
 	 */
-	private void insertExamOrgTime(Exam exam,
-			cn.com.qmth.examcloud.commons.web.security.bean.User accessUser) {
+	private void insertExamOrgTime(Exam exam, User accessUser) {
 		Long examId = exam.getId();
 		Long rootOrgId = accessUser.getRootOrgId();
 		String token = accessUser.getUserToken();