Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/StudentExamResultService.java

@@ -27,6 +27,15 @@ public interface StudentExamResultService extends BaseService<Long, StudentExamR
      */
     void updateStudentExamResult(StudentExamResult studentExamResult);
 
+    /**
+     * @describe 考试结果确认推送
+     * @author Joburgess
+     * @date 2020.07.23
+     * @param examId:
+     * @return void
+     */
+    void examResultConfirmPush(Long examId);
+
     StudentExamResultStatisticsDto getStudentExamResultStatisticsInfo(Integer organId, Integer examId);
 
     /**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -226,6 +226,9 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			if(er.getExamStartTime().compareTo(er.getExamEndTime())>=0){
 				throw new BizException("考试时间异常");
 			}
+			if(!DateUtils.isSameDay(er.getExamStartTime(), er.getExamEndTime())){
+				throw new BizException("暂不支持跨天");
+			}
 			examRooms.add(er);
 		}
 		checkRoomTeachers(examRooms);
@@ -296,6 +299,14 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			examRoom.setExamEndTime(existExamRoom.getExamEndTime());
 		}
 
+		if(examRoom.getExamStartTime().compareTo(examRoom.getExamEndTime())>=0){
+			throw new BizException("考试时间异常");
+		}
+
+		if(!DateUtils.isSameDay(examRoom.getExamStartTime(), examRoom.getExamEndTime())){
+			throw new BizException("暂不支持跨天");
+		}
+
 		List<ExamRoom> examRooms=new ArrayList<>(Arrays.asList(examRoom));
 		checkRoomTeachers(examRooms);
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -102,6 +102,14 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 	}
 
 	@Override
+	public void examResultConfirmPush(Long examId) {
+		if(Objects.isNull(examId)){
+			return;
+		}
+
+	}
+
+	@Override
 	public StudentExamResultStatisticsDto getStudentExamResultStatisticsInfo(Integer organId, Integer examId) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");