diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF01ObjectTag.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF01ObjectTag.java index e36526757..a55a461c1 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF01ObjectTag.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF01ObjectTag.java @@ -63,7 +63,7 @@ public class DF01ObjectTag extends ObjectTag { result.setRemainder(this.getRemainder()); result.setDeal(this.getDeal()); result.setAcc_code(this.getAccCode()); - result.setDat(this.getDat().format(formatter)); + result.setDat(this.getDat() == null ? null : this.getDat().format(formatter)); result.setMarket(this.getMarket()); result.setAcc_name(this.getAccName()); result.setAcc_type(this.getAccType()); diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF04ObjectTag.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF04ObjectTag.java index 255ada9d8..b74b10e74 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF04ObjectTag.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF04ObjectTag.java @@ -85,7 +85,7 @@ public class DF04ObjectTag extends ObjectTag { result.setRbanknam3(this.getRbanknam1()); result.setRbanknam4(this.getRbanknam1()); result.setRbanknam5(this.getRbanknam1()); - result.setPay_date(this.getPayDate().format(formatter)); + result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(formatter)); result.setPay_val(this.getPayVal()); result.setSum_deb(this.getSumDeb()); result.setSpecif_1(this.getSpecif1()); diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java index 50db263b7..5c97ab1af 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java @@ -73,7 +73,7 @@ public class DF06ObjectTag extends ObjectTag { result.setSpec(this.getSpec()); result.setNumber(this.getNumber()); result.setDoc_Num(this.getDocNum()); - result.setDoc_Date(this.getDocDate().format(formatter)); + result.setDoc_Date(this.getDocDate() == null ? null : this.getDocDate().format(formatter)); result.setPay_val(this.getPayVal()); result.setFileName(this.getFileName()); result.setGenerationTime(Instant.now()); diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF52ObjectTag.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF52ObjectTag.java index a4517e568..45d1b3a20 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF52ObjectTag.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF52ObjectTag.java @@ -43,7 +43,7 @@ public class DF52ObjectTag extends ObjectTag { result.setAccount(this.getAccount()); result.setAcc_name(this.getAccName()); result.setDeal(this.getDeal()); - result.setDate(this.getDate().format(formatter)); + result.setDate(this.getDate() == null ? null : this.getDate().format(formatter)); result.setAcc_type(this.getAccType()); result.setStatus(this.getStatus()); result.setFileName(this.getFileName()); diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java index 69b588c48..4ccefd92b 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java @@ -151,7 +151,7 @@ public class DF55ObjectTag extends ObjectTag { result.setRbanknam5(this.getRbanknam1()); result.setOp_type(this.getOpType()); result.setOp_order(this.getOpOrder()); - result.setPay_date(this.getPayDate().format(formatter)); + result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(formatter)); result.setPay_val(this.getPayVal()); result.setSum_deb(this.getSumDeb()); result.setSclientn1(this.getSclientn1()); @@ -172,8 +172,8 @@ public class DF55ObjectTag extends ObjectTag { result.setSend_type(this.getSendType()); result.setDoc_result(this.getDocResult()); result.setDoc_Num(this.getDocNum()); - result.setDoc_Date(this.getDocDate().format(formatter)); - result.setValue_date(this.getValueDate().format(formatter)); + result.setDoc_Date(this.getDocDate() == null ? null : this.getDocDate().format(formatter)); + result.setValue_date(this.getValueDate() == null ? null : this.getValueDate().format(formatter)); result.setSwift_ben(this.getSwiftBen()); result.setSwift_int(this.getSwiftInt()); result.setFileName(this.getFileName()); diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java index f0be858ed..7e9db0c74 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java @@ -142,8 +142,8 @@ public class DF57ObjectTag extends ObjectTag { result.setRbanknam4(this.getRbanknam1()); result.setRbanknam5(this.getRbanknam1()); result.setOp_type(this.getOpType()); - result.setPay_date(this.getPayDate().format(formatter)); - result.setExt_date(this.getExtDate().toString()); + result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(formatter)); + result.setExt_date(this.getExtDate() == null ? null : this.getExtDate().toString()); result.setPay_val(this.getPayVal()); result.setSum_deb(this.getSumDeb()); result.setSclientn1(this.getSclientn1()); @@ -162,7 +162,7 @@ public class DF57ObjectTag extends ObjectTag { result.setAcc_kr(this.getAccKr()); result.setSpecif(this.getSpecif()); result.setDoc_Num(this.getDocNum()); - result.setDoc_Date(this.getDocDate().format(formatter)); + result.setDoc_Date(this.getDocDate() == null ? null : this.getDocDate().format(formatter)); result.setDt_in(this.getDtIn()); result.setKt_in(this.getKtIn()); result.setDt_out(this.getDtOut());