From 4e27aa3e254b9870f20731bfca6281fa7f81df3d Mon Sep 17 00:00:00 2001 From: akulikov Date: Fri, 13 Dec 2024 11:08:26 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-795 --- .../reports/builders/ks/KSRepLccValueReportBuilder.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java index 716f2734e..4bd609cda 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java @@ -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 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> entryTKR : groupedByTKR.entrySet()) { currencyRates.clear(); try { @@ -277,7 +281,7 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder