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

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

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

@@ -248,6 +248,30 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     checkTeacherLeaveDate=false;
                 }
 
+                if(teacherId==100473){
+                    checkTeacherLeaveDate=false;
+                    Calendar tempCalendar=Calendar.getInstance();
+                    tempCalendar.setFirstDayOfWeek(Calendar.MONDAY);
+                    tempCalendar.setTime(practiceGroup.getFirstCourseTime());
+                    if(tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.MONDAY
+                        ||tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){
+                        String date_str=DateUtil.dateToString(practiceGroup.getFirstCourseTime(),"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.getFirstCourseTime().before(date2)
+                                && firstClassEndTime.after(date1)){
+                            continue;
+                        }
+                        if(practiceGroup.getFirstCourseTime().after(date3)){
+                            continue;
+                        }
+                    }
+                    if(tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY){
+                        continue;
+                    }
+                }
+
                 if(checkTeacherLeaveDate){
                     String dateStr=DateUtil.dateToString(practiceGroup.getFirstCourseTime(),"yyyy-MM-dd");
                     JSONObject leaveDateData=teacherLeaveData.getJSONObject(dateStr);
@@ -763,6 +787,29 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                             continue;
                         }
                         Date enableApplyDateCourseEndTime = DateUtil.addMinutes(enableApplyDate, practiceCourseMinutes);
+                        if(teacherId==100473){
+                            checkTeacherLeaveDate=false;
+                            Calendar tempCalendar=Calendar.getInstance();
+                            tempCalendar.setFirstDayOfWeek(Calendar.MONDAY);
+                            tempCalendar.setTime(enableApplyDate);
+                            if(tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.MONDAY
+                                    ||tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){
+                                String date_str=DateUtil.dateToString(enableApplyDate,"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(enableApplyDate.before(date2)
+                                        && enableApplyDateCourseEndTime.after(date1)){
+                                    continue;
+                                }
+                                if(enableApplyDate.after(date3)){
+                                    continue;
+                                }
+                            }
+                            if(tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY){
+                                continue;
+                            }
+                        }
                         if (checkTeacherLeaveDate) {
                             String dateStr=DateUtil.dateToString(enableApplyDate,"yyyy-MM-dd");
                             JSONObject leaveDateData=teacherLeaveData.getJSONObject(dateStr);
@@ -828,6 +875,29 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 List<Date> tempEnableApplyDates = new ArrayList<>();
                 for (Date enableApplyDate : enableApplyDates) {
                     Date enableApplyDateCourseEndTime = DateUtil.addMinutes(enableApplyDate, practiceCourseMinutes);
+                    if(teacherId==100473){
+                        checkTeacherLeaveDate=false;
+                        Calendar tempCalendar=Calendar.getInstance();
+                        tempCalendar.setFirstDayOfWeek(Calendar.MONDAY);
+                        tempCalendar.setTime(enableApplyDate);
+                        if(tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.MONDAY
+                                ||tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){
+                            String date_str=DateUtil.dateToString(enableApplyDate,"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(enableApplyDate.before(date2)
+                                    && enableApplyDateCourseEndTime.after(date1)){
+                                continue;
+                            }
+                            if(enableApplyDate.after(date3)){
+                                continue;
+                            }
+                        }
+                        if(tempCalendar.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY){
+                            continue;
+                        }
+                    }
                     if (checkTeacherLeaveDate) {
                         String dateStr=DateUtil.dateToString(enableApplyDate,"yyyy-MM-dd");
                         JSONObject leaveDateData=teacherLeaveData.getJSONObject(dateStr);