系统收费

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -183,8 +183,19 @@ public class CourseSchedule {
 	private Integer preCourseFlag = 0;
 
 	//课程调整不的超过该时间限制
+	private Date validStartTime;
+
+	//课程调整不的超过该时间限制
 	private Date validEndTime;
 
+	public Date getValidStartTime() {
+		return validStartTime;
+	}
+
+	public void setValidStartTime(Date validStartTime) {
+		this.validStartTime = validStartTime;
+	}
+
 	public Date getValidEndTime() {
 		return validEndTime;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1919,6 +1919,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							throw new BizException("操作失败：不允许跨学期调整");
 						}
 					}
+					if(preCourseSchedule.getValidStartTime() != null){
+						if(preCourseSchedule.getValidStartTime().compareTo(preCourseSchedule.getClassDate()) > 0){
+							throw new BizException("操作失败：不允许跨学期调整");
+						}
+					}
                     for (CourseSchedule backCourseSchedule : existClassDateCourses) {
 
                         //判断前后两节课是否存在冲突
@@ -3376,7 +3381,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 newCourseSchedule.setGroupType(oldCourseSchedule.getGroupType());
             }
 			newCourseSchedule.setValidEndTime(oldCourseSchedule.getValidEndTime());
-            
+			newCourseSchedule.setValidStartTime(oldCourseSchedule.getValidStartTime());
+
             //课程是否已结算
             int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(oldCourseSchedule.getId().intValue());
             if (settlementNum > 0) {
@@ -3498,6 +3504,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					throw new BizException("操作失败：不允许跨学期调整");
 				}
 			}
+			if(newCourseSchedule.getValidStartTime() != null){
+				if(newCourseSchedule.getValidStartTime().compareTo(newCourseSchedule.getClassDate()) > 0){
+					throw new BizException("操作失败：不允许跨学期调整");
+				}
+			}
 
 			if(newCourseSchedule.getStartClassTime().compareTo(date)<0){
 				throw new BizException("调整无效,不能调整至已结束");