|
|
@@ -755,27 +755,27 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
|
|
|
for (EduTrainingPlanCycleEnum value : EduTrainingPlanCycleEnum.values()) {
|
|
|
switch (value) {
|
|
|
case DAILY:
|
|
|
- List<SysWorkTime> dailyFutureWorkTime = getStartAndEndTime(now, EduTrainingPlanCycleEnum.DAILY.getCode(), event);
|
|
|
+ List<SysWorkTime> dailyFutureWorkTime = selectWorkTimeList(now, EduTrainingPlanCycleEnum.DAILY.getCode(), event);
|
|
|
dealTimeWorkChangeForDaily(event, date, dailyFutureWorkTime);
|
|
|
break;
|
|
|
case WEEKLY:
|
|
|
- List<SysWorkTime> weeklyFutureWorkTime = getStartAndEndTime(now, EduTrainingPlanCycleEnum.WEEKLY.getCode(), event);
|
|
|
+ List<SysWorkTime> weeklyFutureWorkTime = selectWorkTimeList(now, EduTrainingPlanCycleEnum.WEEKLY.getCode(), event);
|
|
|
dealTimeWorkChangeForWeekly(event, date, weeklyFutureWorkTime);
|
|
|
break;
|
|
|
case MONTHLY:
|
|
|
- List<SysWorkTime> monthlyFutureWorkTime = getStartAndEndTime(now, EduTrainingPlanCycleEnum.MONTHLY.getCode(), event);
|
|
|
+ List<SysWorkTime> monthlyFutureWorkTime = selectWorkTimeList(now, EduTrainingPlanCycleEnum.MONTHLY.getCode(), event);
|
|
|
dealTimeWorkChangeForMonthly(event, date, monthlyFutureWorkTime);
|
|
|
break;
|
|
|
case QUARTERLY:
|
|
|
- List<SysWorkTime> quarterlyFutureWorkTime = getStartAndEndTime(now, EduTrainingPlanCycleEnum.QUARTERLY.getCode(), event);
|
|
|
+ List<SysWorkTime> quarterlyFutureWorkTime = selectWorkTimeList(now, EduTrainingPlanCycleEnum.QUARTERLY.getCode(), event);
|
|
|
dealTimeWorkChangeForQuarterly(event, date, quarterlyFutureWorkTime);
|
|
|
break;
|
|
|
case HALF_YEARLY:
|
|
|
- List<SysWorkTime> halfYearlyFutureWorkTime = getStartAndEndTime(now, EduTrainingPlanCycleEnum.HALF_YEARLY.getCode(), event);
|
|
|
+ List<SysWorkTime> halfYearlyFutureWorkTime = selectWorkTimeList(now, EduTrainingPlanCycleEnum.HALF_YEARLY.getCode(), event);
|
|
|
dealTimeWorkChangeForHalfYearly(event, date, halfYearlyFutureWorkTime);
|
|
|
break;
|
|
|
case YEARLY:
|
|
|
- List<SysWorkTime> yearlyFutureWorkTime = getStartAndEndTime(now, EduTrainingPlanCycleEnum.YEARLY.getCode(), event);
|
|
|
+ List<SysWorkTime> yearlyFutureWorkTime = selectWorkTimeList(now, EduTrainingPlanCycleEnum.YEARLY.getCode(), event);
|
|
|
dealTimeWorkChangeForYearly(event, date, yearlyFutureWorkTime);
|
|
|
break;
|
|
|
default:
|
|
|
@@ -1065,7 +1065,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
|
|
|
}
|
|
|
|
|
|
|
|
|
- private List<SysWorkTime> getStartAndEndTime(Date now, Integer cycle, WorkTimeChangeEvent event) {
|
|
|
+ private List<SysWorkTime> selectWorkTimeList(Date now, Integer cycle, WorkTimeChangeEvent event) {
|
|
|
DateRange range = DateUtils.getStartAndEnd(now, cycle);
|
|
|
String startTime = DateUtil.format(range.getStartTime(), Constants.DAILY_FORMAT);
|
|
|
String endTime = DateUtil.format(range.getEndTime(), Constants.DAILY_FORMAT);
|