|
|
@@ -144,11 +144,10 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
|
|
|
if (DateUtil.daysBetween(existHomework.getCreateTime(), now) >= 7) {
|
|
|
throw new BizException("该作业已超出可提交时间范围，无法提交作业。");
|
|
|
}
|
|
|
- CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
|
|
|
+ CourseSchedule courseSchedule = courseScheduleDao.get(existHomework.getCourseScheduleId());
|
|
|
//若本周有当前课程所在乐团的服务指标，那么在课程开始当天之后不能再提交作业
|
|
|
- DateUtil.getFirstDayOfMonth(now);
|
|
|
Date classDate = studentExtracurricularExercisesSituationDao.getHomeworkSituations(courseSchedule.getId(),courseSchedule.getMusicGroupId(),"HOMEWORK",
|
|
|
- DateUtil.getFirstDayOfMonth(now),bean.getUserId());
|
|
|
+ DateUtil.getWeekMondayWithDate(now),existHomework.getUserId());
|
|
|
if(Objects.nonNull(classDate)){
|
|
|
int i = classDate.compareTo(DateUtil.stringToDate(DateUtil.format(now, DateUtil.ISO_EXPANDED_DATE_FORMAT), DateUtil.ISO_EXPANDED_DATE_FORMAT));
|
|
|
if(i <= 0){
|
zouxuan