Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherHomeworkListDto.java

@@ -46,6 +46,16 @@ public class TeacherHomeworkListDto {
 
     private int isReplied;
 
+    private int isSubmit;
+
+    public int getIsSubmit() {
+        return isSubmit;
+    }
+
+    public void setIsSubmit(int isSubmit) {
+        this.isSubmit = isSubmit;
+    }
+
     public int getIsReplied() {
         return isReplied;
     }

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

@@ -56,6 +56,7 @@ 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)){
@@ -65,6 +66,10 @@ 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){
+					teacherHomeworkListDto.setIsSubmit(1);
+				}
 			}
 		}
 		if (count != 0) {