|
@@ -1698,18 +1698,18 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
practiceGroup.setSecondCourseTime(practiceGroup.getFirstCourseTime());
|
|
|
practiceGroup.setFirstCourseTime(tmp);
|
|
|
}
|
|
|
- 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(now)
|
|
|
- || practiceGroup.getSecondCourseTime().after(activityEndDate)) {
|
|
|
- result.put("status", "APPLY_DATE_OVERFLOW");
|
|
|
- result.put("info", "预约失败,网管课的时间超出活动时间范围(2020-5-31之前),请重试。");
|
|
|
- return result;
|
|
|
- }
|
|
|
+// 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(now)
|
|
|
+// || practiceGroup.getSecondCourseTime().after(activityEndDate)) {
|
|
|
+// result.put("status", "APPLY_DATE_OVERFLOW");
|
|
|
+// result.put("info", "预约失败,网管课的时间超出活动时间范围(2020-5-31之前),请重试。");
|
|
|
+// return result;
|
|
|
+// }
|
|
|
if (DateUtil.isSameDay(practiceGroup.getFirstCourseTime(), practiceGroup.getSecondCourseTime())) {
|
|
|
result.put("status", "TWO_DATE_ON_ONE_DAY");
|
|
|
result.put("info", "预约失败,网管课选择时间重复,请重试。");
|
|
@@ -1758,18 +1758,18 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
allCourseDates.remove(3);
|
|
|
allCourseDates.add(DateUtil.addDays(tempDate, 7));
|
|
|
}
|
|
|
- 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(now)
|
|
|
- || allCourseDates.get(3).after(courseExpireDate)) {
|
|
|
- result.put("status", "APPLY_DATE_OVERFLOW");
|
|
|
- result.put("info", "预约失败,网管课的时间超出活动时间范围(2020-5-31之前),请重试。");
|
|
|
- return result;
|
|
|
- }
|
|
|
+// 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(now)
|
|
|
+// || allCourseDates.get(3).after(courseExpireDate)) {
|
|
|
+// result.put("status", "APPLY_DATE_OVERFLOW");
|
|
|
+// result.put("info", "预约失败,网管课的时间超出活动时间范围(2020-5-31之前),请重试。");
|
|
|
+// return result;
|
|
|
+// }
|
|
|
allCourseDates.sort(Comparator.comparing(Date::getTime));
|
|
|
|
|
|
studentDao.lockUser(practiceGroup.getStudentId());
|