教务端课表bug修复

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseHomeworkServiceImpl.java

@@ -59,12 +59,12 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 				if(CollectionUtils.isEmpty(studentCourseHomeworks)){
 					continue;
 				}
-				Map<YesOrNoEnum, List<StudentCourseHomework>> replyStudentsMap = studentCourseHomeworks.stream().collect(Collectors.groupingBy(StudentCourseHomework::getIsReplied));
-				if(CollectionUtils.isEmpty(replyStudentsMap.get(YesOrNoEnum.NO))){
+				long noRepliedNum=studentCourseHomeworks.stream().filter(e -> e.getStatus().equals(YesOrNoEnum.YES)&&e.getIsReplied().equals(YesOrNoEnum.NO)).count();
+				if(noRepliedNum<=0){
 					teacherHomeworkListDto.setIsReplied(YesOrNoEnum.YES.getCode());
 				}
-				List<StudentCourseHomework> collect = studentCourseHomeworks.stream().filter(e -> Objects.nonNull(e.getAttachments())).collect(Collectors.toList());
-				if(!CollectionUtils.isEmpty(collect)&&collect.size()>0){
+				long notSubmitNum = studentCourseHomeworks.stream().filter(e -> e.getStatus().equals(YesOrNoEnum.NO)).count();
+				if(notSubmitNum<=0){
 					teacherHomeworkListDto.setIsSubmit(1);
 				}
 			}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExtracurricularExercisesServiceImpl.java

@@ -106,12 +106,12 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 				if(CollectionUtils.isEmpty(extracurricularExercisesReplies)){
 					continue;
 				}
-				long repliedNum = extracurricularExercisesReplies.stream().filter(e -> e.getIsReplied() == 0).count();
-				if(repliedNum<=0){
+				long noRepliedNum = extracurricularExercisesReplies.stream().filter(e -> e.getStatus()==1&&e.getIsReplied() == 0).count();
+				if(noRepliedNum<=0){
 					extracurricularExercises.setIsReplied(1);
 				}
-				long submitNum = extracurricularExercisesReplies.stream().filter(e -> e.getIsView() == 1).count();
-				if(submitNum>0){
+				long notSubmitNum = extracurricularExercisesReplies.stream().filter(e -> e.getStatus() == 0).count();
+				if(notSubmitNum<=0){
 					extracurricularExercises.setIsSubmit(1);
 				}
 			}