浏览代码

。。。。

wangwei 5 年之前
父节点
当前提交
1827999f8d

+ 0 - 22
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamStudentCloudServiceProvider.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.examcloud.core.examwork.api.provider;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.google.common.collect.Lists;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.commons.util.BooleanUtil;
 import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
 import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
@@ -45,7 +43,6 @@ import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamEntity;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudentEntity;
 import cn.com.qmth.examcloud.core.examwork.service.ExamService;
 import cn.com.qmth.examcloud.core.examwork.service.ExamStudentService;
-import cn.com.qmth.examcloud.core.examwork.service.bean.ExamSpecialSettingsInfo;
 import cn.com.qmth.examcloud.core.examwork.service.bean.ExamStudentInfo;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
@@ -145,25 +142,6 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
 
 		ExamStudentInfo saved = examStudentService.saveExamStudent(info);
 
-		Date specialBeginTime = req.getSpecialBeginTime();
-		Date specialEndTime = req.getSpecialEndTime();
-
-		if (!new Boolean(null == specialBeginTime).equals(new Boolean(null == specialEndTime))) {
-			throw new StatusException("210101", "specialBeginTime & specialEndTime  wrong");
-		}
-
-		int trueNum = BooleanUtil.countTrue(null != specialBeginTime, null != specialEndTime);
-		if (2 == trueNum) {
-			ExamSpecialSettingsInfo examSpecialInfo = new ExamSpecialSettingsInfo();
-			examSpecialInfo.setBeginTime(specialBeginTime);
-			examSpecialInfo.setEndTime(specialEndTime);
-			examSpecialInfo.setExamId(req.getExamId());
-			examSpecialInfo.setExamLimit(false);
-			examSpecialInfo.setRootOrgId(req.getRootOrgId());
-			examSpecialInfo.setStudentId(saved.getStudentId());
-			examService.saveExamSpecialSettings(examSpecialInfo);
-		}
-
 		SaveExamStudentResp resp = new SaveExamStudentResp();
 
 		ExamStudentBean examStudentBean = new ExamStudentBean();

+ 12 - 6
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamStudentServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.core.examwork.service.impl;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -332,16 +333,21 @@ public class ExamStudentServiceImpl implements ExamStudentService {
 		examStudent.setExt4(examStudentInfo.getExt4());
 		examStudent.setExt5(examStudentInfo.getExt5());
 
+		Date specialBeginTime = examStudentInfo.getSpecialBeginTime();
+		Date specialEndTime = examStudentInfo.getSpecialEndTime();
+
+		if (!new Boolean(null == specialBeginTime).equals(new Boolean(null == specialEndTime))) {
+			throw new StatusException("210101", "specialBeginTime & specialEndTime  wrong");
+		}
+
 		// 临时代码
-		if (null != examStudentInfo.getSpecialBeginTime()) {
-			examStudent.setExt4(DateUtil.format(examStudentInfo.getSpecialBeginTime(),
-					DatePatterns.CHINA_DEFAULT));
+		if (null != specialBeginTime) {
+			examStudent.setExt4(DateUtil.format(specialBeginTime, DatePatterns.CHINA_DEFAULT));
 		} else {
 			examStudent.setExt4(null);
 		}
-		if (null != examStudentInfo.getSpecialEndTime()) {
-			examStudent.setExt5(DateUtil.format(examStudentInfo.getSpecialEndTime(),
-					DatePatterns.CHINA_DEFAULT));
+		if (null != specialEndTime) {
+			examStudent.setExt5(DateUtil.format(specialEndTime, DatePatterns.CHINA_DEFAULT));
 		} else {
 			examStudent.setExt5(null);
 		}