diff --git a/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/scheduler/ISchedulerChecker.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/scheduler/ISchedulerChecker.java index 2bc665aa5..0c8d273cc 100644 --- a/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/scheduler/ISchedulerChecker.java +++ b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/scheduler/ISchedulerChecker.java @@ -24,12 +24,8 @@ public class ISchedulerChecker { * @param isWeekend тек.день=СБ-ВС
*/ public static boolean isWorkDayByTradingCalendar(ClearingCalendar clearingCalendar, boolean isWeekend) { - if (clearingCalendar.getDayStatus() != null && clearingCalendar.getDayStatus().equalsIgnoreCase(DayStatus.Workday.getKey())) { - if (isWeekend) { - return clearingCalendar.getCompanyId() != null && clearingCalendar.getCompanyId() != 0; - } else return true; - } - return false; + return clearingCalendar.getDayStatus() != null + && clearingCalendar.getDayStatus().equalsIgnoreCase(DayStatus.Workday.getKey()); } public static boolean isWorkDayByTradingCalendar(ClearingCalendar clearingCalendar) {