Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-core-examwork

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

@@ -164,7 +164,7 @@ public class ExamController extends ControllerSupport {
 	DataSyncCloudService dataSyncCloudService;
 
 	private static final String[] EXAM_ORG_SETTINGS_EXCEL_HEADER = new String[]{"学习中心ID", "学习中心代码",
-			"学习中心名称", "是否可以考试", "开始考试时间", "结束考试时间"};
+			"学习中心名称", "是否可以考试(是/否)", "开始考试时间 yyyy-MM-dd hh:mm:ss", "结束考试时间 yyyy-MM-dd hh:mm:ss"};
 
 	@ApiOperation(value = "查询考试课程的试卷类型集合")
 	@GetMapping("queryExamCoursePaperTypeList")
@@ -1099,7 +1099,6 @@ public class ExamController extends ControllerSupport {
 		Map<Long, OrgBean> orgMap = Maps.newHashMap();
 		GetOrgsReq getOrgsReq = new GetOrgsReq();
 		getOrgsReq.setRootOrgId(rootOrgId);
-		getOrgsReq.setEnable(true);
 		Long start = null;
 		while (true) {
 			getOrgsReq.setStart(start);
@@ -1145,6 +1144,9 @@ public class ExamController extends ControllerSupport {
 				continue;
 			}
 			OrgBean orgBean = entry.getValue();
+			if (!orgBean.getEnable()) {
+				continue;
+			}
 
 			datas.add(new Object[]{String.valueOf(orgBean.getId()), orgBean.getCode(),
 					orgBean.getName(), null, null, null});

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

@@ -123,7 +123,7 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 
 		examInfo.setBeginTime(req.getBeginTime());
 		examInfo.setDuration(req.getDuration());
-		examInfo.setEnable(true);
+		examInfo.setEnable(false);
 		examInfo.setEndTime(req.getEndTime());
 		examInfo.setExamTimes(req.getExamTimes());
 

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

@@ -76,7 +76,7 @@ public class ExamServiceImpl implements ExamService {
 	DataSyncCloudService dataSyncCloudService;
 
 	private static final String[] EXAM_ORG_SETTINGS_EXCEL_HEADER = new String[]{"学习中心ID", "学习中心代码",
-			"学习中心名称", "是否可以考试", "开始考试时间", "结束考试时间"};
+			"学习中心名称", "是否可以考试(是/否)", "开始考试时间 yyyy-MM-dd hh:mm:ss", "结束考试时间 yyyy-MM-dd hh:mm:ss"};
 
 	/**
 	 * 方法注释
@@ -330,7 +330,7 @@ public class ExamServiceImpl implements ExamService {
 		Date beginTime = examSpecialInfo.getBeginTime();
 		Date endTime = examSpecialInfo.getEndTime();
 
-		if (new Boolean(null == beginTime).equals(new Boolean(null == endTime))) {
+		if (!new Boolean(null == beginTime).equals(new Boolean(null == endTime))) {
 			throw new StatusException("E-001101", "beginTime & endTime  wrong");
 		}
 
@@ -485,6 +485,8 @@ public class ExamServiceImpl implements ExamService {
 					msg.append("  是否可以开始考试必须为['是','否',空]");
 					hasError = true;
 				}
+			} else {
+				specialSettings.setExamLimit(false);
 			}
 
 			String beginTime = trimAndNullIfBlank(line[4]);
@@ -525,11 +527,15 @@ public class ExamServiceImpl implements ExamService {
 					.findByExamIdAndOrgIdAndCourseIdIsNull(examId, cur.getOrgId());
 
 			if (null != query) {
+				query.setExamType(examEntity.getExamType());
+				query.setExamEnable(examEntity.getEnable());
 				query.setExamLimit(cur.getExamLimit());
 				query.setBeginTime(cur.getBeginTime());
 				query.setEndTime(cur.getEndTime());
 				examSpecialSettingsRepo.save(query);
 			} else {
+				cur.setExamType(examEntity.getExamType());
+				cur.setExamEnable(examEntity.getEnable());
 				examSpecialSettingsRepo.save(cur);
 			}
 		}