|
@@ -329,7 +329,7 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
}
|
|
|
|
|
|
if(weekInHoliday){
|
|
|
- studentExtracurricularExercisesSituationDao.deleteByMonday(monDayDate.toString(), null);
|
|
|
+ studentExtracurricularExercisesSituationDao.deleteByMonday(monDayDate.toString(), studentIds);
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -542,9 +542,9 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
|
|
|
if(!CollectionUtils.isEmpty(results)){
|
|
|
|
|
|
- if(CollectionUtils.isEmpty(studentIds)){
|
|
|
- studentIds = results.stream().map(StudentExtracurricularExercisesSituation::getStudentId).collect(Collectors.toList());
|
|
|
- }
|
|
|
+// if(CollectionUtils.isEmpty(studentIds)){
|
|
|
+// studentIds = results.stream().map(StudentExtracurricularExercisesSituation::getStudentId).collect(Collectors.toList());
|
|
|
+// }
|
|
|
|
|
|
Map<Integer, List<StudentServeCourseHomeworkDto>> studentHomeworkMap=new HashMap<>();
|
|
|
Map<Integer, List<ExtracurricularExercisesReply>> studentExercisesMap=new HashMap<>();
|