作业提交

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

@@ -151,21 +151,9 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         if(Objects.nonNull(classDate)){
             int i = classDate.compareTo(DateUtil.stringToDate(DateUtil.format(now, DateUtil.ISO_EXPANDED_DATE_FORMAT), DateUtil.ISO_EXPANDED_DATE_FORMAT));
             if(i <= 0){
-                throw new BizException("该作业已超出可提交时间范围，无法提交作业。");
+                throw new BizException("已超过提交作业期限。");
             }
         }
-//        List<StudentExtracurricularExercisesSituation> exercisesSituations = studentExtracurricularExercisesSituationDao.findServiceWithCourse(
-//                DateUtil.format(DateUtil.addDays(DateUtil.getLastDayOfMonth(now), 1), DateUtil.ISO_EXPANDED_DATE_FORMAT),
-//                existHomework.getCourseScheduleId());
-//        if(!CollectionUtils.isEmpty(exercisesSituations)){
-//            CourseSchedule courseSchedule = courseScheduleDao.get(existHomework.getCourseScheduleId());
-//            int i = courseSchedule.getClassDate().compareTo(DateUtil.stringToDate(DateUtil.format(now, DateUtil.ISO_EXPANDED_DATE_FORMAT), DateUtil.ISO_EXPANDED_DATE_FORMAT));
-//            if(i <= 0){
-//                throw new BizException("该作业已超出可提交时间范围，无法提交作业。");
-//            }
-//        }
-
-//        boolean push = Objects.isNull(existHomework.getAttachments());
         boolean push = true;
         bean.setSubmitTime(now);
         super.update(bean);
@@ -175,35 +163,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         courseHomework.setGroupType(courseSchedule.getGroupType());
         courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
         courseHomeworkService.update(courseHomework);
-
-//        LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
-//        LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-//        LocalDate createDateTime = LocalDateTime.ofInstant(courseSchedule.getClassDate().toInstant(), DateUtil.zoneId).toLocalDate();
-//        LocalDate createMonday = createDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-//        LocalDate homeworkCreateDateTime = LocalDateTime.ofInstant(existHomework.getCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
-//        boolean isOk = false;
-//        switch (createDateTime.getDayOfWeek()) {
-//            case SATURDAY:
-//                if (createDateTime.until(homeworkCreateDateTime, ChronoUnit.DAYS) < 4) {
-//                    isOk = true;
-//                }
-//                break;
-//            case SUNDAY:
-//                if (createDateTime.until(homeworkCreateDateTime, ChronoUnit.DAYS) < 3) {
-//                    isOk = true;
-//                }
-//                break;
-//            default:
-//                if (createDateTime.get(DateUtil.weekFields.weekOfYear()) == homeworkCreateDateTime.get(DateUtil.weekFields.weekOfYear())) {
-//                    isOk = true;
-//                }
-//                break;
-//        }
-
         studentServeService.updateExercisesSituation(courseSchedule.getClassDate(), new ArrayList<>(Arrays.asList(bean.getUserId())), courseSchedule.getTeacherId());
 
-//        CourseHomework temp = courseHomeworkService.get(courseHomework.getId());
-//        if (temp.getExpectNum().equals(courseHomework.getCompletedNum())) {
         Integer userId = bean.getUserId();
         if (courseSchedule.getType().equals(CourseScheduleType.VIP)) {
             userId = null;
@@ -214,7 +175,6 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             review.setHandHomework(YesOrNoEnum.YES.getCode());
             courseScheduleReviewDao.update(review);
         }
-//        }
 
         if (push) {
             Map<Integer, String> userMap = new HashMap<>();