diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java index 143ffe7dd..6914c414e 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportDataCollector.java @@ -6,12 +6,12 @@ import ru.spcex.clearing.reports.reports.AbstractReport; import ru.spcex.platform.utils.time.TimeUtil; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.Instant; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.List; +import java.util.Locale; public abstract class ReportDataCollector { public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy"); @@ -55,9 +55,17 @@ public abstract class ReportDataCollector { return val.toString(); } + + protected String toString(Double val) { + if (val == null) return null; + // точность 2 знака после запятой. + return String.format(Locale.US, "%.2f", val.doubleValue()); + } + protected String toString(BigDecimal val) { if (val == null) return null; - return val.toString(); + // точность 2 знака после запятой. + return val.setScale(2, RoundingMode.HALF_UP).toString(); } protected String toString(Instant val) { diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java index 7774d4b6d..51ff529d6 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P1_collector.java @@ -130,8 +130,8 @@ public class Bt17_1_P1_collector extends ReportDataCollector