|
@@ -160,7 +160,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
|
|
|
dataList = extracurricularExercisesReplyDao.findStudentHomeworkDetailsInTimeZone(params);
|
|
|
Map<String, List<StudentServiceDetailDto>> weekHomeworks=new HashMap<>();
|
|
|
for (StudentServiceDetailDto studentServiceDetailDto : dataList) {
|
|
|
- LocalDate homeworkCreateTime = LocalDateTime.ofInstant(studentServiceDetailDto.getHomeworkCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
+ LocalDate homeworkCreateTime = LocalDateTime.ofInstant(studentServiceDetailDto.getCourseStartTime().toInstant(), DateUtil.zoneId).toLocalDate();
|
|
|
String mondayStr = homeworkCreateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).toString();
|
|
|
if(!weekHomeworks.containsKey(mondayStr)){
|
|
|
weekHomeworks.put(mondayStr, new ArrayList<>());
|