From 67c059928499dfdcb5b6b56266bf3f1c5a26ab81 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Thu, 2 May 2024 10:53:24 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-595=20?= =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D1=83(=D0=BD=D0=B5=D0=BE=D0=B1=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=D0=B8=D0=BC=D0=BE=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BD=D0=BE=D0=B2=D1=83=D1=8E?= =?UTF-8?q?=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D1=83=20=D1=81=20CompanyId=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=A2=D0=97).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/scheduler/ISchedulerChecker.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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) {