1、提交作业添加限制；

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

@@ -137,6 +137,10 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		if(Objects.isNull(extracurricularExercises)){
 			throw new BizException("作业不存在");
 		}
+		Date now=new Date();
+		if (DateUtil.daysBetween(extracurricularExercises.getCreateTime(), now)>14){
+			throw new BizException("该作业已超出可提交时间范围，无法提交作业。");
+		}
 		existExtra.setAttachments(extracurricularExercisesReply.getAttachments());
 		existExtra.setStatus(1);
 		existExtra.setSubmitTime(new Date());

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

@@ -951,7 +951,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         calendar.set(Calendar.MILLISECOND, 0);
         calendar.add(Calendar.DATE, 1);
         Date applyStartDate = calendar.getTime();
-        Date applyEndDate = DateUtil.stringToDate("2020-05-24", "yyyy-MM-dd");
+        Date applyEndDate = DateUtil.stringToDate("2020-10-24", "yyyy-MM-dd");
         Date firstMonday = DateUtil.getWeekDayWithDate(applyStartDate, Calendar.MONDAY);
         Date secondSunday = DateUtil.getWeekDayWithDate(applyEndDate, Calendar.SUNDAY);
 
@@ -1694,13 +1694,13 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             practiceGroup.setSecondCourseTime(practiceGroup.getFirstCourseTime());
             practiceGroup.setFirstCourseTime(tmp);
         }
-        if (practiceGroup.getFirstCourseTime().before(activityStartDate)
+        if (practiceGroup.getFirstCourseTime().before(now)
                 || practiceGroup.getFirstCourseTime().after(activityEndDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
             result.put("info", "预约失败，网管课的时间超出活动时间范围（2020-5-31之前），请重试。");
             return result;
         }
-        if (practiceGroup.getSecondCourseTime().before(activityStartDate)
+        if (practiceGroup.getSecondCourseTime().before(now)
                 || practiceGroup.getSecondCourseTime().after(activityEndDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
             result.put("info", "预约失败，网管课的时间超出活动时间范围（2020-5-31之前），请重试。");
@@ -1754,13 +1754,13 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             allCourseDates.remove(3);
             allCourseDates.add(DateUtil.addDays(tempDate, 7));
         }
-        if (allCourseDates.get(2).before(activityStartDate)
+        if (allCourseDates.get(2).before(now)
                 || allCourseDates.get(2).after(courseExpireDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
             result.put("info", "预约失败，网管课的时间超出活动时间范围（2020-5-31之前），请重试。");
             return result;
         }
-        if (allCourseDates.get(3).before(activityStartDate)
+        if (allCourseDates.get(3).before(now)
                 || allCourseDates.get(3).after(courseExpireDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");
             result.put("info", "预约失败，网管课的时间超出活动时间范围（2020-5-31之前），请重试。");

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

@@ -94,8 +94,13 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         if (Objects.isNull(bean) || Objects.isNull(bean.getId()) || Objects.isNull(existHomework)) {
             throw new BizException("作业不存在");
         }
+        Date now=new Date();
+        if (DateUtil.daysBetween(existHomework.getCreateTime(), now)>14){
+            throw new BizException("该作业已超出可提交时间范围，无法提交作业。");
+        }
+
         boolean push = Objects.isNull(existHomework.getAttachments());
-        bean.setSubmitTime(new Date());
+        bean.setSubmitTime(now);
         super.update(bean);
         bean = studentCourseHomeworkDao.get(bean.getId());
         CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());

mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -150,9 +150,9 @@ public class PracticeGroupController extends BaseController {
         if(excludeOrganIds.contains(sysUser.getOrganId())){
             throw new BizException("请联系老师确认您的所属分部");
         }
-        if(!ENABLE_APPLY_ORGANIDS.contains(sysUser.getOrganId())){
-            throw new BizException("陪练课预约活动已结束");
-        }
+//        if(!ENABLE_APPLY_ORGANIDS.contains(sysUser.getOrganId())){
+//            throw new BizException("陪练课预约活动已结束");
+//        }
         practiceGroup.setStudentId(sysUser.getId());
         return succeed(practiceGroupService.practiceApply(practiceGroup));
     }