|
@@ -959,12 +959,18 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Set<Long> getTeacherHomeworkCourseIdsWithMonday(Integer teacherId, String monday) {
|
|
|
+ public Set<Long> getTeacherHomeworkCourseIdsWithMonday(Integer teacherId, Date date) {
|
|
|
Set<Long> courseIds = new HashSet<>();
|
|
|
if(Objects.isNull(teacherId)){
|
|
|
return courseIds;
|
|
|
}
|
|
|
- List<String> courseIdsStrs = studentExtracurricularExercisesSituationDao.getTeacherHomeworkCourseIdsWithMonday(teacherId, monday);
|
|
|
+ String mondayStr = null;
|
|
|
+ if(Objects.nonNull(date)){
|
|
|
+ Date monday = DateUtil.getWeekMondayWithDate(date);
|
|
|
+ mondayStr = DateUtil.dateToString(monday, DateUtil.ISO_EXPANDED_DATE_FORMAT);
|
|
|
+ }
|
|
|
+
|
|
|
+ List<String> courseIdsStrs = studentExtracurricularExercisesSituationDao.getTeacherHomeworkCourseIdsWithMonday(teacherId, mondayStr);
|
|
|
if(CollectionUtils.isEmpty(courseIdsStrs)){
|
|
|
return courseIds;
|
|
|
}
|