Ver código fonte

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

Joburgess 5 anos atrás
pai
commit
b4c51b378a

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

@@ -780,7 +780,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     }
                 }
 
-                if (!CollectionUtils.isEmpty(firstWeekCourses)) {
+                if (!CollectionUtils.isEmpty(secondWeekCourses)) {
                     Map<GroupType, Long> groupTypeCountSecondMap = secondWeekCourses.stream().collect(Collectors.groupingBy(CourseSchedule::getGroupType, Collectors.counting()));
                     if (Objects.nonNull(groupTypeCountSecondMap.get(GroupType.PRACTICE)) && groupTypeCountSecondMap.get(GroupType.PRACTICE) >= 80) {
                         secondWeekEnableApply = false;
@@ -807,7 +807,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                             &&enableApplyDate.before(leaveEndTime)) {
                         continue;
                     }
-                    if (!enableApplyDate.before(enableApplyStartDate)) {
+                    if (!enableApplyDate.before(enableApplyStartDate)&&!enableApplyEndDate.before(enableApplyDate)) {
                         tempEnableApplyDates.add(enableApplyDate);
                     }
                 }