This commit is contained in:
parent
7efde73c9e
commit
c3b9142dc2
1 changed files with 17 additions and 0 deletions
|
|
@ -2,6 +2,7 @@ package ru.spcex.clearing.reports.builders.ks;
|
|||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.time.DayOfWeek;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -118,6 +119,22 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
|
|||
|
||||
|
||||
LocalDateTime reportDate = LocalDateTime.now().minusDays(1);
|
||||
do {
|
||||
ClearingCalendar clearingDate = clearingCalendarImdg.getFirstObjectByPredicate(
|
||||
clearingCalendarImdg.predicateBuilder().equals("clearingDate", reportDate.toLocalDate())
|
||||
);
|
||||
DayStatus dayStatus;
|
||||
if (clearingDate != null) dayStatus = IEnumKey.getEnumByKey(DayStatus.class, clearingDate.getDayStatus());
|
||||
else dayStatus = null;
|
||||
|
||||
if (reportDate.getDayOfWeek() != DayOfWeek.SUNDAY && reportDate.getDayOfWeek() != DayOfWeek.SATURDAY) {
|
||||
if (dayStatus != DayStatus.DayOff) break;
|
||||
} else {
|
||||
if (dayStatus == DayStatus.Workday) break;
|
||||
}
|
||||
reportDate = reportDate.minusDays(1);
|
||||
} while (true);
|
||||
|
||||
ImdgPredicateBuilder pb = clearingCalendarImdg.predicateBuilder();
|
||||
do {
|
||||
ClearingCalendar clearingDate = clearingCalendarImdg.getFirstObjectByPredicate(pb.equals("clearing_date", reportDate));
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue