treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

registry-service: fix date/time

Browse source
This commit is contained in:
akulikov 2024-01-12 18:36:39 +03:00
parent 460642c98c
commit 960e8b2c7e
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/DepoBalanceRegisterReportBuilder.java
View file

@ -13,6 +13,7 @@ import ru.spcex.platform.utils.enumeration.IEnumKey;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Collection; import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
@ -40,8 +41,8 @@ public class DepoBalanceRegisterReportBuilder extends XLSXReportBuilder<DepoBala
@Override @Override
protected DepoBalanceRegisterReport toRow(RegistryHistory registryHistory) { protected DepoBalanceRegisterReport toRow(RegistryHistory registryHistory) {
Registry input = registryHistory.getObject(); Registry input = registryHistory.getObject();
LocalDate now = LocalDate.now(); LocalDateTime nowTime = LocalDateTime.ofInstant(registryHistory.getEventTime(), ZoneId.systemDefault());
LocalDateTime nowTime = LocalDateTime.now(); LocalDate now = nowTime.toLocalDate();
DepoBalanceRegisterReport entity = new DepoBalanceRegisterReport(); DepoBalanceRegisterReport entity = new DepoBalanceRegisterReport();
entity.setHouseName("АО РЦД"); entity.setHouseName("АО РЦД");

5
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
View file

@ -13,6 +13,7 @@ import ru.spcex.platform.utils.enumeration.IEnumKey;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Collection; import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
@ -40,8 +41,8 @@ public class MoneyBalanceRegisterReportBuilder extends XLSXReportBuilder<MoneyBa
@Override @Override
protected MoneyBalanceRegisterReport toRow(RegistryHistory registryHistory) { protected MoneyBalanceRegisterReport toRow(RegistryHistory registryHistory) {
Registry input = registryHistory.getObject(); Registry input = registryHistory.getObject();
LocalDate now = LocalDate.now(); LocalDateTime nowTime = LocalDateTime.ofInstant(registryHistory.getEventTime(), ZoneId.systemDefault());
LocalDateTime nowTime = LocalDateTime.now(); LocalDate now = nowTime.toLocalDate();
MoneyBalanceRegisterReport entity = new MoneyBalanceRegisterReport(); MoneyBalanceRegisterReport entity = new MoneyBalanceRegisterReport();
Company company = companyImdg.getSingleObjectByID(2L); Company company = companyImdg.getSingleObjectByID(2L);

2
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/XLSXReportBuilder.java
View file

@ -125,7 +125,7 @@ public abstract class XLSXReportBuilder<R extends FileReport, I extends SpcexObj
cell.setCellStyle(style); cell.setCellStyle(style);
} else { } else {
Number number = (Number) field.get(obj); Number number = (Number) field.get(obj);
cell.setCellValue(number.intValue()); cell.setCellValue(number.longValue());
} }
} else if (type == LocalDate.class || type == LocalDateTime.class) { } else if (type == LocalDate.class || type == LocalDateTime.class) {
CsvDate csvDateAnnotation = field.getAnnotation(CsvDate.class); CsvDate csvDateAnnotation = field.getAnnotation(CsvDate.class);