ignore_files

mec-biz/src/main/java/com/ym/mec/biz/service/PracticeGroupService.java

@@ -62,7 +62,7 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
      * @param days: 天数
      * @return java.util.Map
      */
-	List<Date> getEnableApplyDates(Integer days);
+	List<Date> getEnableApplyDates(Date startDay,Date endDay);
 
     /**
      * @describe 陪练课预约

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

@@ -190,7 +190,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         while (calendar.getTime().before(activityEndDate)){
             calendar.add(Calendar.DATE,1);
             Date applyStartDay = calendar.getTime();
-            calendar.add(Calendar.DATE,7);
+            calendar.add(Calendar.DATE,6);
             Date applyEndDay = calendar.getTime();
             if(applyEndDay.after(activityEndDate)){
                 applyEndDay=activityEndDate;
@@ -292,7 +292,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         while (calendar.getTime().before(activityEndDate)){
             calendar.add(Calendar.DATE,1);
             Date applyStartDay = calendar.getTime();
-            calendar.add(Calendar.DATE,7);
+            calendar.add(Calendar.DATE,6);
             Date applyEndDay = calendar.getTime();
             if(applyEndDay.after(activityEndDate)){
                 applyEndDay=activityEndDate;
@@ -427,12 +427,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         while (calendar.getTime().before(activityEndDate)){
             calendar.add(Calendar.DATE,1);
             Date applyStartDay = calendar.getTime();
-            calendar.add(Calendar.DATE,7);
+            calendar.add(Calendar.DATE,6);
             Date applyEndDay = calendar.getTime();
             if(applyEndDay.after(activityEndDate)){
                 applyEndDay=activityEndDate;
             }
-            List<Date> enableApplyDates = getEnableApplyDates(7);
+            List<Date> enableApplyDates = getEnableApplyDates(applyStartDay,applyEndDay);
             List<CourseSchedule> allTeacherCourses = courseScheduleDao.findTeachersCoursesWithDateRange(teacherIds, applyStartDay, applyEndDay);
             HashSet<Integer> excludeTeacherIds=new HashSet<>();
             if(Objects.nonNull(firstClassTime)){
@@ -496,14 +496,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     }
 
     @Override
-    public List<Date> getEnableApplyDates(Integer days) {
+    public List<Date> getEnableApplyDates(Date startDay,Date endDay) {
         List<Date> result=new ArrayList<>();
         Calendar calendar = Calendar.getInstance();
-        Date now = new Date();
-        if(now.before(applyStartDay)){
-            now=applyStartDay;
-        }
-        calendar.setTime(now);
+        calendar.setTime(startDay);
+        calendar.add(Calendar.DATE, -1);
         calendar.set(Calendar.SECOND, 0);
         SysConfig practiceApplyStartTimeConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_APPLY_START_TIME);
         SysConfig practiceApplyEndTimeConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_APPLY_END_TIME);
@@ -511,7 +508,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         String enableStartTimeStr = practiceApplyStartTimeConfig.getParanValue();
         String enableEndTimeStr = practiceApplyEndTimeConfig.getParanValue();
         Integer practiceApplyIntervalMinutes=practiceApplyIntervalTimeConfig.getParanValue(Integer.class);
-        for (int i = 0; i < days; i++) {
+        while (!calendar.getTime().after(endDay)) {
             calendar.add(Calendar.DATE, 1);
             calendar.set(Calendar.HOUR_OF_DAY, Integer.valueOf(enableStartTimeStr.split(":")[0]));
             calendar.set(Calendar.MINUTE, Integer.valueOf(enableStartTimeStr.split(":")[1]));

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2119,6 +2119,7 @@
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>
+        AND csts.group_type_!='PRACTICE'
         FOR UPDATE
     </select>
     <select id="findStudentPracticeCourses" resultMap="courseScheduleDto">