1、陪练课名称生成逻辑调整

2、一个部门下只有一节课成导致的可预约日期异常

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

@@ -263,7 +263,26 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                                 && firstClassEndTime.after(date1)){
                             continue;
                         }
-                        if(practiceGroup.getFirstCourseTime().after(date3)){
+                        if(date3.before(firstClassEndTime)){
+                            continue;
+                        }
+                    }
+                    if(tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY){
+                        continue;
+                    }
+
+                    tempCalendar.setTime(practiceGroup.getSecondCourseTime());
+                    if(tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.MONDAY
+                            ||tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){
+                        String date_str=DateUtil.dateToString(practiceGroup.getSecondCourseTime(),"yyyy-MM-dd");
+                        Date date1=DateUtil.stringToDate(date_str+" 11:30:00");
+                        Date date2=DateUtil.stringToDate(date_str+" 14:30:00");
+                        Date date3=DateUtil.stringToDate(date_str+" 20:30:00");
+                        if(practiceGroup.getSecondCourseTime().before(date2)
+                                && firstClassEndTime.after(date1)){
+                            continue;
+                        }
+                        if(date3.before(secondClassEndTime)){
                             continue;
                         }
                     }
@@ -802,7 +821,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                                         && enableApplyDateCourseEndTime.after(date1)){
                                     continue;
                                 }
-                                if(enableApplyDate.after(date3)){
+                                if(date3.before(enableApplyDateCourseEndTime)){
                                     continue;
                                 }
                             }
@@ -890,7 +909,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                                     && enableApplyDateCourseEndTime.after(date1)){
                                 continue;
                             }
-                            if(enableApplyDate.after(date3)){
+                            if(date3.before(enableApplyDateCourseEndTime)){
                                 continue;
                             }
                         }