From 9e9229588c38e98368242bad1d574583fe7f3427 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 30 Dec 2022 14:52:24 +0300
Subject: [PATCH] =?UTF-8?q?reports-service=20=D1=82=D0=BE=D1=87=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=202=20=D0=B7=D0=BD=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B7=D0=B0=D0=BF=D1=8F?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reports/services/ReportDataCollector.java | 14 ++++++++---
 .../collector/Bt17_1_P1_collector.java        |  4 ++--
 .../collector/Bt17_1_P2_collector.java        |  4 ++--
 .../services/ReportDataCollectorTest.java     | 23 +++++++++++++++++++
 4 files changed, 38 insertions(+), 7 deletions(-)

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<T extends AbstractReport> {
     public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy");
@@ -55,9 +55,17 @@ public abstract class ReportDataCollector<T extends AbstractReport> {
         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<ReportBR_0420315_P1
                 ReportBR_0420315_P1.Info_0420315_P1 info_0420315_p1 = new ReportBR_0420315_P1.Info_0420315_P1(company.getId().toString(),
                         company.getFullName(),
                         onMarketString,
-                        String.valueOf(contractorQty),
-                        String.valueOf(liabilitiesAmount));
+                        toString(contractorQty),
+                        toString(liabilitiesAmount));
                 reportBR_0420315_p1.getRows().add(info_0420315_p1);
             }
         }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java
index 69040ecd4..82ff969fb 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/Bt17_1_P2_collector.java
@@ -58,8 +58,8 @@ public class Bt17_1_P2_collector extends ReportDataCollector<ReportBR_0420315_P2
 
         ReportBR_0420315_P2 reportBR_0420315_p2 = new ReportBR_0420315_P2(startDate, endDate,
                 "BR",
-                String.valueOf(contractorQty),
-                String.valueOf(liabilitiesAmount));
+                toString(contractorQty),
+                toString(liabilitiesAmount));
 
         return reportBR_0420315_p2;
     }
diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java
index 7c16b767c..6a2ea7a52 100644
--- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java
+++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportDataCollectorTest.java
@@ -3,6 +3,7 @@ package ru.spcex.clearing.reports.services;
 import org.junit.jupiter.api.Test;
 import ru.spcex.clearing.reports.reports.AbstractReport;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -35,6 +36,28 @@ class ReportDataCollectorTest extends ReportDataCollector {
         assertEquals("26.12.2022", instance.toString(val));
     }
 
+    @Test
+    void testToString3() {
+        ReportDataCollectorTest instance = new ReportDataCollectorTest();
+        assertEquals(null, instance.toString((BigDecimal)null));
+        assertEquals("0.00", instance.toString(BigDecimal.ZERO));
+        assertEquals("1.10", instance.toString(BigDecimal.valueOf(1.10)));
+        assertEquals("100.12", instance.toString(BigDecimal.valueOf(100.12)));
+        assertEquals("100.12", instance.toString(BigDecimal.valueOf(100.120012)));
+        assertEquals("100.13", instance.toString(BigDecimal.valueOf(100.125012)));
+    }
+
+    @Test
+    void testToString4() {
+        ReportDataCollectorTest instance = new ReportDataCollectorTest();
+        assertEquals(null, instance.toString((Double) null));
+        assertEquals("0.00", instance.toString(0.0));
+        assertEquals("1.10", instance.toString(1.10));
+        assertEquals("100.12", instance.toString(100.12));
+        assertEquals("100.12", instance.toString(100.120012));
+        assertEquals("100.13", instance.toString(100.125012));
+    }
+
     @Override
     public AbstractReport collectReportWithPeriod(LocalDate startDate, LocalDate endDate) {
         throw new IllegalStateException("test");