From dbe967de51ab35bc76d66d44374e9c969f124e96 Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Thu, 21 Nov 2024 17:14:30 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-791 DF56 empty values fixed --- .../xml/exporter/logic/data/tags/objects/DF56ObjectTag.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF56ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF56ObjectTag.java index 705da1f38..3d930d78f 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF56ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF56ObjectTag.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; -import java.time.format.DateTimeFormatter; import java.util.Objects; import org.springframework.format.annotation.DateTimeFormat; import ru.clearing.classes.statics.data.sdf.SDf56; @@ -48,8 +47,8 @@ public class DF56ObjectTag extends ObjectTag { this.startDatetime = Instant.ofEpochMilli(this.startUnixtime).atZone(ZoneId.systemDefault()).toLocalDateTime(); this.endUnixtime = Long.valueOf(entity.getEnd_datetime()); this.endDatetime = Instant.ofEpochMilli(this.endUnixtime).atZone(ZoneId.systemDefault()).toLocalDateTime(); - this.account = entity.getAccount(); - this.deal = entity.getDeal(); + this.account = entity.getAccount() == null ? "" : entity.getAccount(); + this.deal = entity.getDeal() == null ? "" : entity.getDeal(); } @Override