....

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

@@ -50,9 +50,9 @@ import cn.com.qmth.examcloud.commons.helpers.DynamicEnum;
 import cn.com.qmth.examcloud.commons.helpers.DynamicEnumManager;
 import cn.com.qmth.examcloud.commons.helpers.poi.ExcelWriter;
 import cn.com.qmth.examcloud.commons.util.DateUtil;
+import cn.com.qmth.examcloud.commons.util.DateUtil.DatePatterns;
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
 import cn.com.qmth.examcloud.commons.util.RegExpUtil;
-import cn.com.qmth.examcloud.commons.util.DateUtil.DatePatterns;
 import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
@@ -71,19 +71,19 @@ import cn.com.qmth.examcloud.core.examwork.dao.ExamCourseGroupRelationRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamCourseGroupSettingsRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamCourseRelationRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamOrgPropertyRepo;
-import cn.com.qmth.examcloud.core.examwork.dao.ExamSpecialSettingsRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamPaperTypeRelationRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamPropertyRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamSpecialSettingsRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamCourseGroupRelationEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamCourseGroupSettingsEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamCourseRelationEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgPropertyEntity;
-import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamSpecialSettingsEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamPaperTypeRelationEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamPropertyEntity;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamSpecialSettingsEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudentEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.enums.ExamType;
 import cn.com.qmth.examcloud.core.examwork.service.bean.ExamInfo;
@@ -96,7 +96,7 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.CheckExamIsStartedResp;
 import cn.com.qmth.examcloud.task.api.DataSyncCloudService;
 import cn.com.qmth.examcloud.task.api.request.SyncExamReq;
 import cn.com.qmth.examcloud.web.config.SystemConfig;
-import cn.com.qmth.examcloud.web.enums.DataExecutionStatus;
+import cn.com.qmth.examcloud.web.enums.CURD;
 import cn.com.qmth.examcloud.web.helpers.page.PageInfo;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 import cn.com.qmth.examcloud.web.security.bean.User;
@@ -507,7 +507,7 @@ public class ExamController extends ControllerSupport {
 	@ApiOperation(value = "新增考试批次", notes = "新增")
 	@PostMapping()
 	public ExamEntity addExam(@RequestBody ExamDomain domain) {
-		return saveExam(domain, DataExecutionStatus.CREATION);
+		return saveExam(domain, CURD.CREATION);
 	}
 
 	/**
@@ -520,7 +520,7 @@ public class ExamController extends ControllerSupport {
 	@ApiOperation(value = "更新考试批次", notes = "更新")
 	@PutMapping()
 	public ExamEntity updateExam(@RequestBody ExamDomain domain) {
-		return saveExam(domain, DataExecutionStatus.UPDATE);
+		return saveExam(domain, CURD.UPDATE);
 	}
 
 	/**
@@ -530,7 +530,7 @@ public class ExamController extends ControllerSupport {
 	 * @param domain
 	 * @return
 	 */
-	private ExamEntity saveExam(ExamDomain domain, DataExecutionStatus es) {
+	private ExamEntity saveExam(ExamDomain domain, CURD es) {
 		trim(domain, false);
 
 		User accessUser = getAccessUser();

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

@@ -76,7 +76,7 @@ import cn.com.qmth.examcloud.examwork.api.response.LockExamStudentsResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.UnlockExamStudentsResp;
-import cn.com.qmth.examcloud.web.enums.DataExecutionStatus;
+import cn.com.qmth.examcloud.web.enums.CURD;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
@@ -144,7 +144,7 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 		Map<String, String> properties = req.getProperties();
 		examInfo.setProperties(properties);
 
-		ExamEntity saved = examService.saveExam(examInfo, DataExecutionStatus.CREATION_OR_UPDATE);
+		ExamEntity saved = examService.saveExam(examInfo, CURD.CREATION_OR_UPDATE);
 
 		SaveExamResp resp = new SaveExamResp();
 		resp.setExamId(saved.getId());

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

@@ -8,7 +8,7 @@ import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamSpecialSettingsEntity;
 import cn.com.qmth.examcloud.core.examwork.service.bean.ExamInfo;
 import cn.com.qmth.examcloud.core.examwork.service.bean.ExamSpecialSettingsInfo;
-import cn.com.qmth.examcloud.web.enums.DataExecutionStatus;
+import cn.com.qmth.examcloud.web.enums.CURD;
 
 /**
  * 类注释
@@ -26,7 +26,7 @@ public interface ExamService {
 	 * @param examInfo
 	 * @return
 	 */
-	ExamEntity saveExam(ExamInfo examInfo, DataExecutionStatus es);
+	ExamEntity saveExam(ExamInfo examInfo, CURD es);
 
 	/**
 	 * 保存考试机构设置

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

@@ -22,8 +22,8 @@ import cn.com.qmth.examcloud.commons.helpers.DynamicEnum;
 import cn.com.qmth.examcloud.commons.helpers.DynamicEnumManager;
 import cn.com.qmth.examcloud.commons.helpers.poi.ExcelReader;
 import cn.com.qmth.examcloud.commons.util.DateUtil;
-import cn.com.qmth.examcloud.commons.util.PathUtil;
 import cn.com.qmth.examcloud.commons.util.DateUtil.DatePatterns;
+import cn.com.qmth.examcloud.commons.util.PathUtil;
 import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
@@ -43,7 +43,7 @@ import cn.com.qmth.examcloud.core.examwork.service.bean.ExamInfo;
 import cn.com.qmth.examcloud.core.examwork.service.bean.ExamSpecialSettingsInfo;
 import cn.com.qmth.examcloud.task.api.DataSyncCloudService;
 import cn.com.qmth.examcloud.task.api.request.SyncExamReq;
-import cn.com.qmth.examcloud.web.enums.DataExecutionStatus;
+import cn.com.qmth.examcloud.web.enums.CURD;
 
 /**
  * 类注释
@@ -103,7 +103,7 @@ public class ExamServiceImpl implements ExamService {
 	 * qmth.examcloud.core.examwork.service.bean.ExamInfo)
 	 */
 	@Override
-	public ExamEntity saveExam(ExamInfo examInfo, DataExecutionStatus es) {
+	public ExamEntity saveExam(ExamInfo examInfo, CURD es) {
 
 		if (null == examInfo.getExamType()) {
 			throw new StatusException("E-001005", "考试类型为空");
@@ -127,9 +127,9 @@ public class ExamServiceImpl implements ExamService {
 
 		ExamEntity exam = null;
 
-		DataExecutionStatus realStatus = null;
+		CURD realStatus = null;
 		// 更新
-		if (es.equals(DataExecutionStatus.UPDATE)) {
+		if (es.equals(CURD.UPDATE)) {
 			if (null != examInfo.getId()) {
 				exam = examRepo.findOne(examInfo.getId());
 				if (null == exam) {
@@ -151,10 +151,10 @@ public class ExamServiceImpl implements ExamService {
 				throw new StatusException("E-002005", "考试名称已存在");
 			}
 
-			realStatus = DataExecutionStatus.UPDATE;
+			realStatus = CURD.UPDATE;
 		}
 		// 创建
-		else if (es.equals(DataExecutionStatus.CREATION)) {
+		else if (es.equals(CURD.CREATION)) {
 			if (null != examInfo.getId()) {
 				throw new StatusException("E-002004", "id is needless");
 			}
@@ -165,10 +165,10 @@ public class ExamServiceImpl implements ExamService {
 			}
 			exam = new ExamEntity();
 			exam.setEnable(true);
-			realStatus = DataExecutionStatus.CREATION;
+			realStatus = CURD.CREATION;
 		}
 		// (根据考试名称)新增或创建
-		else if (es.equals(DataExecutionStatus.CREATION_OR_UPDATE)) {
+		else if (es.equals(CURD.CREATION_OR_UPDATE)) {
 			if (null != examInfo.getId()) {
 				throw new StatusException("E-002006", "id is needless");
 			}
@@ -176,7 +176,7 @@ public class ExamServiceImpl implements ExamService {
 			if (null == exam) {
 				exam = new ExamEntity();
 				exam.setEnable(true);
-				realStatus = DataExecutionStatus.CREATION;
+				realStatus = CURD.CREATION;
 			} else {
 				if (!exam.getRootOrgId().equals(examInfo.getRootOrgId())) {
 					throw new StatusException("E-002003", "rootOrgId is wrong");
@@ -184,11 +184,11 @@ public class ExamServiceImpl implements ExamService {
 				if (!exam.getExamType().equals(examInfo.getExamType())) {
 					throw new StatusException("E-002100", "examType is wrong");
 				}
-				realStatus = DataExecutionStatus.UPDATE;
+				realStatus = CURD.UPDATE;
 			}
 		}
 
-		if (realStatus.equals(DataExecutionStatus.CREATION)) {
+		if (realStatus.equals(CURD.CREATION)) {
 			if (null == examInfo.getBeginTime()) {
 				throw new StatusException("E-002006", "beginTime is null");
 			}