akulikov 2024-12-13 11:08:26 +03:00
parent 7d672a905b
commit 4e27aa3e25

View file

@ -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;
@ -110,7 +111,10 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
.collect(Collectors.groupingBy(Registry::getTradingClearingRegistry));
Map<String, Rates> currencyRates = new HashMap<>();
LocalDateTime nowTime = LocalDateTime.now();
LocalDateTime reportDate = LocalDateTime.now();
if (reportDate.getDayOfWeek() == DayOfWeek.MONDAY) reportDate = reportDate.minusDays(3);
else if (reportDate.getDayOfWeek() == DayOfWeek.SUNDAY) reportDate = reportDate.minusDays(2);
else reportDate = reportDate.minusDays(1);
for (Map.Entry<String, List<Registry>> entryTKR : groupedByTKR.entrySet()) {
currencyRates.clear();
try {
@ -277,7 +281,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
try {
KSRepLccValueReport row = new KSRepLccValueReport();
row.setFirmId(firmId);
row.setReportDate(nowTime);
row.setReportDate(reportDate);
row.setTkr(tkr);
row.setSumValue(sumValue);
row.setValue(values.get(rate.getCurrencyId()));