From 960e8b2c7e38c32301645cbc80f2f9aede84cc5c Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Fri, 12 Jan 2024 18:36:39 +0300
Subject: [PATCH] registry-service: fix date/time

---
 .../reports/builders/DepoBalanceRegisterReportBuilder.java   | 5 +++--
 .../reports/builders/MoneyBalanceRegisterReportBuilder.java  | 5 +++--
 .../registry/reports/builders/XLSXReportBuilder.java         | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoBalanceRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoBalanceRegisterReportBuilder.java
index c3c91c411..1312e1483 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoBalanceRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoBalanceRegisterReportBuilder.java
@@ -13,6 +13,7 @@ import ru.spcex.platform.utils.enumeration.IEnumKey;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.Comparator;
@@ -40,8 +41,8 @@ public class DepoBalanceRegisterReportBuilder extends XLSXReportBuilder<DepoBala
     @Override
     protected DepoBalanceRegisterReport toRow(RegistryHistory registryHistory) {
         Registry input = registryHistory.getObject();
-        LocalDate now = LocalDate.now();
-        LocalDateTime nowTime = LocalDateTime.now();
+        LocalDateTime nowTime = LocalDateTime.ofInstant(registryHistory.getEventTime(), ZoneId.systemDefault());
+        LocalDate now = nowTime.toLocalDate();
         DepoBalanceRegisterReport entity = new DepoBalanceRegisterReport();
 
         entity.setHouseName("АО РЦД");
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
index b44c2fec0..c805b6a55 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
@@ -13,6 +13,7 @@ import ru.spcex.platform.utils.enumeration.IEnumKey;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.Comparator;
@@ -40,8 +41,8 @@ public class MoneyBalanceRegisterReportBuilder extends XLSXReportBuilder<MoneyBa
     @Override
     protected MoneyBalanceRegisterReport toRow(RegistryHistory registryHistory) {
         Registry input = registryHistory.getObject();
-        LocalDate now = LocalDate.now();
-        LocalDateTime nowTime = LocalDateTime.now();
+        LocalDateTime nowTime = LocalDateTime.ofInstant(registryHistory.getEventTime(), ZoneId.systemDefault());
+        LocalDate now = nowTime.toLocalDate();
         MoneyBalanceRegisterReport entity = new MoneyBalanceRegisterReport();
 
         Company company = companyImdg.getSingleObjectByID(2L);
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/XLSXReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/XLSXReportBuilder.java
index 3ef2f9b50..4da5360e4 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/XLSXReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/XLSXReportBuilder.java
@@ -125,7 +125,7 @@ public abstract class XLSXReportBuilder<R extends FileReport, I extends SpcexObj
                                 cell.setCellStyle(style);
                             } else {
                                 Number number = (Number) field.get(obj);
-                                cell.setCellValue(number.intValue());
+                                cell.setCellValue(number.longValue());
                             }
                         } else if (type == LocalDate.class || type == LocalDateTime.class) {
                             CsvDate csvDateAnnotation = field.getAnnotation(CsvDate.class);