diff --git a/swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field61Generate.java b/swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field61Generate.java index 44c017a..fbb849b 100644 --- a/swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field61Generate.java +++ b/swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field61Generate.java @@ -47,11 +47,17 @@ public class Field61Generate extends AbstractMx2MtTagsGenerate { for (int i=0; i<entryCount; i++) { String value = ""; String valueDateStr = getXmlNodeValue(bodyHdrParentElementName, document, "Stmt.Ntry("+i+").ValDt.Dt"); + if (StringUtil.isEmpty(valueDateStr)) { + valueDateStr = getXmlNodeValue(bodyHdrParentElementName, document, "Stmt.Ntry("+i+").ValDt.DtTm"); + } if (StringUtil.isNotEmpty(valueDateStr)) { XMLGregorianCalendar valueDate = DatatypeFactory.newInstance().newXMLGregorianCalendar(valueDateStr); value += DateUtil.format(valueDate, "yyMMdd"); } String bookDateStr = getXmlNodeValue(bodyHdrParentElementName, document, "Stmt.Ntry("+i+").BookgDt.Dt"); + if (StringUtil.isEmpty(bookDateStr)) { + bookDateStr = getXmlNodeValue(bodyHdrParentElementName, document, "Stmt.Ntry("+i+").BookgDt.DtTm"); + } if (StringUtil.isNotEmpty(bookDateStr)) { XMLGregorianCalendar bookDate = DatatypeFactory.newInstance().newXMLGregorianCalendar(bookDateStr); value += DateUtil.format(bookDate, "MMdd");