|
@@ -1692,7 +1692,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
if (regCalender != null && regCalender.getDeadlinePaymentDate() != null) {
|
|
|
musicGroup.setPaymentExpireDate(regCalender.getDeadlinePaymentDate());
|
|
|
}
|
|
|
- if (musicGroup.getPaymentExpireDate() != null && DateUtil.daysBetween(musicGroup.getPaymentExpireDate(), now) > 1) {
|
|
|
+
|
|
|
+ if (musicGroup.getPaymentExpireDate() != null && now.compareTo(DateUtil.getLastTimeWithDay(musicGroup.getPaymentExpireDate()))>0) {
|
|
|
return "乐团缴费时间已截止";
|
|
|
}
|
|
|
}
|
|
@@ -1708,10 +1709,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
return "乐团已建多批次缴费";
|
|
|
}
|
|
|
|
|
|
- Integer hasStartCourseNum = courseScheduleDao.getMusicGroupHasStartCourseNum(musicGroup.getId());
|
|
|
- if (hasStartCourseNum != null && hasStartCourseNum > 0) {
|
|
|
- return "乐团已开课";
|
|
|
- }
|
|
|
+// Integer hasStartCourseNum = courseScheduleDao.getMusicGroupHasStartCourseNum(musicGroup.getId());
|
|
|
+// if (hasStartCourseNum != null && hasStartCourseNum > 0) {
|
|
|
+// return "乐团已开课";
|
|
|
+// }
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
@@ -1730,12 +1731,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
viewMap.remove(musicGroupId);
|
|
|
}
|
|
|
});
|
|
|
- List<CourseSchedule> musicGroupsHasStartCourseNums = courseScheduleDao.getMusicGroupsHasStartCourseNum(ids);
|
|
|
- for (CourseSchedule musicGroupsHasStartCourseNum : musicGroupsHasStartCourseNums) {
|
|
|
- if(viewMap.containsKey(musicGroupsHasStartCourseNum.getMusicGroupId())){
|
|
|
- viewMap.remove(musicGroupsHasStartCourseNum.getMusicGroupId());
|
|
|
- }
|
|
|
- }
|
|
|
+// List<CourseSchedule> musicGroupsHasStartCourseNums = courseScheduleDao.getMusicGroupsHasStartCourseNum(ids);
|
|
|
+// for (CourseSchedule musicGroupsHasStartCourseNum : musicGroupsHasStartCourseNums) {
|
|
|
+// if(viewMap.containsKey(musicGroupsHasStartCourseNum.getMusicGroupId())){
|
|
|
+// viewMap.remove(musicGroupsHasStartCourseNum.getMusicGroupId());
|
|
|
+// }
|
|
|
+// }
|
|
|
return viewMap;
|
|
|
}
|
|
|
}
|