作业提交

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

@@ -267,9 +267,6 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 						}else if(noRepliedNum<=0&&notSubmitNum<=0){
 							homeworkListDto.setStatus(3);
 						}
-						if(homeworkListDto.getIsSubmit() == 0){
-							homeworkListDto.setIsReplied(0);
-						}
 					}
 					dataList.addAll(byIdList);
 				}
@@ -303,16 +300,14 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 						}else if(noRepliedNum<=0&&notSubmitNum<=0){
 							teacherHomeworkListDto.setStatus(3);
 						}
-						if(teacherHomeworkListDto.getIsSubmit() == 0){
-							teacherHomeworkListDto.setIsReplied(0);
-						}
 					}
 					dataList.addAll(byIdList);
 				}
 			}
 			dataList.removeAll(Collections.singleton(null));
 			dataList = dataList.stream().sorted(Comparator.comparing(TeacherHomeworkListDto::getDay).reversed()).
-					sorted(Comparator.comparing(TeacherHomeworkListDto::getIsReplied)).collect(Collectors.toList());
+					sorted(Comparator.comparing(TeacherHomeworkListDto::getStatus)).
+					collect(Collectors.toList());
 			pageInfo.setRows(dataList);
 		}
 		return pageInfo;

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

@@ -140,7 +140,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             throw new BizException("作业不存在");
         }
         Date now = new Date();
-        //若下周有服务指标课程，则在课程开始当天不可提交
+        //若本周有当前课程所在乐团的服务指标，那么在课程开始当天之后不能再提交作业
+//        studentExtracurricularExercisesSituationDao.getHomeworkSituations(existHomework.getCourseScheduleId(),);
 //        List<StudentExtracurricularExercisesSituation> exercisesSituations = studentExtracurricularExercisesSituationDao.findServiceWithCourse(
 //                DateUtil.format(DateUtil.addDays(DateUtil.getLastDayOfMonth(now), 1), DateUtil.ISO_EXPANDED_DATE_FORMAT),
 //                existHomework.getCourseScheduleId());