Selaa lähdekoodia

1、陪练课名称生成逻辑调整
2、一个部门下只有一节课成导致的可预约日期异常

Joburgess 5 vuotta sitten
vanhempi
commit
e492f2d61c

+ 7 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -705,9 +705,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 }
                 }
 
 
                 applyDateRangeCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
                 applyDateRangeCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
-                for (int j = 0; j < applyDateRangeCourses.size() - 1; j++) {
+                for (int j = 0; j < applyDateRangeCourses.size(); j++) {
                     CourseSchedule preCourseSchedule = applyDateRangeCourses.get(j);
                     CourseSchedule preCourseSchedule = applyDateRangeCourses.get(j);
-                    CourseSchedule backCourseSchedule = applyDateRangeCourses.get(j + 1);
+                    CourseSchedule backCourseSchedule = j>=applyDateRangeCourses.size()-1?preCourseSchedule:applyDateRangeCourses.get(j + 1);
                     if (preCourseSchedule.getEndClassTime().after(backCourseSchedule.getEndClassTime())) {
                     if (preCourseSchedule.getEndClassTime().after(backCourseSchedule.getEndClassTime())) {
                         backCourseSchedule.setEndClassTime(preCourseSchedule.getEndClassTime());
                         backCourseSchedule.setEndClassTime(preCourseSchedule.getEndClassTime());
                     }
                     }
@@ -722,7 +722,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                             }
                             }
                         }
                         }
                     }
                     }
-                    if (j == applyDateRangeCourses.size() - 2) {
+                    if (j == applyDateRangeCourses.size() - 1) {
                         for (Date enableApplyDate : tempEnableApplyDates) {
                         for (Date enableApplyDate : tempEnableApplyDates) {
                             if (Objects.nonNull(firstClassTime) && DateUtil.isSameDay(enableApplyDate, firstClassTime)) {
                             if (Objects.nonNull(firstClassTime) && DateUtil.isSameDay(enableApplyDate, firstClassTime)) {
                                 continue;
                                 continue;
@@ -732,6 +732,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                             }
                             }
                         }
                         }
                     }
                     }
+                    if(j>=applyDateRangeCourses.size()-1){
+                        break;
+                    }
                     for (Date enableApplyDate : tempEnableApplyDates) {
                     for (Date enableApplyDate : tempEnableApplyDates) {
                         if (Objects.nonNull(firstClassTime) && DateUtil.isSameDay(enableApplyDate, firstClassTime)) {
                         if (Objects.nonNull(firstClassTime) && DateUtil.isSameDay(enableApplyDate, firstClassTime)) {
                             continue;
                             continue;
@@ -885,7 +888,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             return result;
             return result;
         }
         }
         SysUser sysUser = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
         SysUser sysUser = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
-        practiceGroup.setName("陪练课•" + sysUser.getUsername());
+        practiceGroup.setName(subject.getName() + "•" + sysUser.getUsername());
         practiceGroup.setSingleClassMinutes(practiceCourseMinutes);
         practiceGroup.setSingleClassMinutes(practiceCourseMinutes);
         practiceGroupDao.insert(practiceGroup);
         practiceGroupDao.insert(practiceGroup);