|
@@ -54,7 +54,6 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
|
|
|
List<Long> courseIds = dataList.stream().mapToLong(TeacherHomeworkListDto::getCourseScheduleId).boxed().collect(Collectors.toList());
|
|
|
List<StudentCourseHomework> allStudentCourseHomeworks = studentCourseHomeworkDao.findByCourses(courseIds);
|
|
|
Map<Long, List<StudentCourseHomework>> homeworkStudentMap = allStudentCourseHomeworks.stream().collect(Collectors.groupingBy(StudentCourseHomework::getCourseScheduleId));
|
|
|
- Map<YesOrNoEnum, List<StudentCourseHomework>> statusStudentMpa = allStudentCourseHomeworks.stream().collect(Collectors.groupingBy(StudentCourseHomework::getStatus));
|
|
|
for (TeacherHomeworkListDto teacherHomeworkListDto : dataList) {
|
|
|
List<StudentCourseHomework> studentCourseHomeworks = homeworkStudentMap.get(teacherHomeworkListDto.getCourseScheduleId().longValue());
|
|
|
if(CollectionUtils.isEmpty(studentCourseHomeworks)){
|
|
@@ -64,8 +63,8 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
|
|
|
if(CollectionUtils.isEmpty(replyStudentsMap.get(YesOrNoEnum.NO))){
|
|
|
teacherHomeworkListDto.setIsReplied(YesOrNoEnum.YES.getCode());
|
|
|
}
|
|
|
- List<StudentCourseHomework> studentCourseHomeworks1 = statusStudentMpa.get(YesOrNoEnum.YES);
|
|
|
- if(!CollectionUtils.isEmpty(studentCourseHomeworks1)&&studentCourseHomeworks1.size()>0){
|
|
|
+ List<StudentCourseHomework> collect = studentCourseHomeworks.stream().filter(e -> Objects.nonNull(e.getAttachments())).collect(Collectors.toList());
|
|
|
+ if(!CollectionUtils.isEmpty(collect)&&collect.size()>0){
|
|
|
teacherHomeworkListDto.setIsSubmit(1);
|
|
|
}
|
|
|
}
|