This commit is contained in:
parent
7d672a905b
commit
4e27aa3e25
1 changed files with 6 additions and 2 deletions
|
|
@ -2,6 +2,7 @@ package ru.spcex.clearing.reports.builders.ks;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
|
import java.time.DayOfWeek;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
@ -110,7 +111,10 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
|
||||||
.collect(Collectors.groupingBy(Registry::getTradingClearingRegistry));
|
.collect(Collectors.groupingBy(Registry::getTradingClearingRegistry));
|
||||||
|
|
||||||
Map<String, Rates> currencyRates = new HashMap<>();
|
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()) {
|
for (Map.Entry<String, List<Registry>> entryTKR : groupedByTKR.entrySet()) {
|
||||||
currencyRates.clear();
|
currencyRates.clear();
|
||||||
try {
|
try {
|
||||||
|
|
@ -277,7 +281,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder<EmptyParams, KS
|
||||||
try {
|
try {
|
||||||
KSRepLccValueReport row = new KSRepLccValueReport();
|
KSRepLccValueReport row = new KSRepLccValueReport();
|
||||||
row.setFirmId(firmId);
|
row.setFirmId(firmId);
|
||||||
row.setReportDate(nowTime);
|
row.setReportDate(reportDate);
|
||||||
row.setTkr(tkr);
|
row.setTkr(tkr);
|
||||||
row.setSumValue(sumValue);
|
row.setSumValue(sumValue);
|
||||||
row.setValue(values.get(rate.getCurrencyId()));
|
row.setValue(values.get(rate.getCurrencyId()));
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue