Commit 96b44192 by zhanghou

修改camt054的56域的逻辑顺序,解决节点值显示不完全的缺陷

parent ffe337b0
...@@ -40,7 +40,6 @@ public class Camt054001Parse56Field extends AbstractMt2MxCamt054001ParseField { ...@@ -40,7 +40,6 @@ public class Camt054001Parse56Field extends AbstractMt2MxCamt054001ParseField {
String account = ""; String account = "";
if(field56A!=null){ if(field56A!=null){
String bicCode = field56A.getBIC(); String bicCode = field56A.getBIC();
mt_to_mxBICFI(bicCode, intrmyAgt1Maps);
if (StringUtil.isNotEmpty(field56A.getComponent1())) { if (StringUtil.isNotEmpty(field56A.getComponent1())) {
account = "/" + field56A.getComponent1(); account = "/" + field56A.getComponent1();
} }
...@@ -52,6 +51,13 @@ public class Camt054001Parse56Field extends AbstractMt2MxCamt054001ParseField { ...@@ -52,6 +51,13 @@ public class Camt054001Parse56Field extends AbstractMt2MxCamt054001ParseField {
mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps); mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);
} }
} }
if(clrSysMmbIdMaps.size()>0){
finInstnIdMaps.put("clrSysMmbId", clrSysMmbIdMaps);
}
if(finInstnIdMaps.size()>0){
intrmyAgt1Maps.put("finInstnId", finInstnIdMaps);
}
mt_to_mxBICFI(bicCode, intrmyAgt1Maps);
} }
if (field56D != null) { if (field56D != null) {
if (StringUtil.isNotEmpty(field56D.getComponent1())) { if (StringUtil.isNotEmpty(field56D.getComponent1())) {
...@@ -65,15 +71,15 @@ public class Camt054001Parse56Field extends AbstractMt2MxCamt054001ParseField { ...@@ -65,15 +71,15 @@ public class Camt054001Parse56Field extends AbstractMt2MxCamt054001ParseField {
mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps); mt_to_mxClearingIdentifier(account, clrSysMmbIdMaps);
} }
} }
if(clrSysMmbIdMaps.size()>0){
finInstnIdMaps.put("clrSysMmbId", clrSysMmbIdMaps);
}
if(finInstnIdMaps.size()>0){
intrmyAgt1Maps.put("finInstnId", finInstnIdMaps);
}
String nameAddress = field56D.getNameAndAddress(); String nameAddress = field56D.getNameAndAddress();
mt_to_mxFinancialInstitutionNameAndUnstructuredAddress(nameAddress, intrmyAgt1Maps); mt_to_mxFinancialInstitutionNameAndUnstructuredAddress(nameAddress, intrmyAgt1Maps);
} }
if(clrSysMmbIdMaps.size()>0){
finInstnIdMaps.put("clrSysMmbId", clrSysMmbIdMaps);
}
if(finInstnIdMaps.size()>0){
intrmyAgt1Maps.put("finInstnId", finInstnIdMaps);
}
if(intrmyAgt1Maps.size()>0){ if(intrmyAgt1Maps.size()>0){
rltdAgtsMaps.put("intrmyAgt1",intrmyAgt1Maps); rltdAgtsMaps.put("intrmyAgt1",intrmyAgt1Maps);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment