treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-595

Browse source 
Исправил ошибку(необходимо реализовать новую логику с CompanyId из ТЗ).
This commit is contained in:
psemenkov 2024-05-02 10:53:24 +03:00
parent 0fb88db608
commit 67c0599284
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/scheduler/ISchedulerChecker.java
View file

@ -24,12 +24,8 @@ public class ISchedulerChecker {
* @param isWeekend тек.день=СБ-ВС<br>
*/
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) {