940、950合并模板

src/main/java/com/prowidesoftware/brilliance/mx2mt/mt940950/Mx2Mt950Creator.java

@@ -45,8 +45,6 @@ public class Mx2Mt950Creator extends AbstractMx2MtCreator {
             fieldsGenerateList.add(new Field65Generate());
             fieldsGenerateList.add(new Field86Generate());
         }
-        fieldsGenerateList.add(new ReceiverBicFieldGenerate());
-        fieldsGenerateList.add(new SenderBicFieldGenerate());
         fieldsGenerateList.add(new Field20Generate());
         fieldsGenerateList.add(new Field25aGenerate());
         fieldsGenerateList.add(new Field28CGenerate());
@@ -72,13 +70,8 @@ public class Mx2Mt950Creator extends AbstractMx2MtCreator {
             }
         });
         String outPutFilePath = (String) map.get(Mx2MtConstants.OUT_PUT_FILE_PATH);
-        String template;
-        if (getMtMsg())
-            template = "swift_mt_940.vm";
-        else
-            template = "swift_mt_950.vm";
 
-        return TemplateUtil.makeFileByTemplate(template, map, outPutFilePath, "utf-8");
+        return TemplateUtil.makeFileByTemplate("swift_mt_940_950.vm", map, outPutFilePath, "utf-8");
     }
 
     /**

src/main/resources/template/swift_mt_950.vm → src/main/resources/template/swift_mt_940_950.vm

-{1:F01${vm.receiverBic}0001000001}{2:O950${vm.createTime}${vm.createDate}${vm.senderBic}0002000001${vm.outDate}${vm.outTime}N}{3:{108:178908658RSC1}{111:001}{121:9bc16ba2-76e0-4651-b225-3bae8552f17a}}{4:
+{1:$vm.head1}{2:$vm.head2}#if(!$null.isNull($vm.head3) && $vm.head3.length()>0){3:$vm.head3}#end{4:
 :20:$vm.field20
+#if(!$null.isNull($vm.field21) && $vm.field21.length()>0)
+:21:$vm.field21
+#end
 :25:$vm.field25a
 :28C:$vm.field28C
-#if($vm.field60Option=="F")
+#if($vm.field60Option=='F')
 :60F:$vm.field60
-#elseif($vm.field60Option=="M")
+#elseif($vm.field60Option=='M')
 :60M:$vm.field60
 #end
 #if(!$null.isNull($vm.field61List) && $vm.field61List.size()!=0)
@@ -12,12 +15,18 @@
 :61:$field61
 #end
 #end
-#if($vm.field62Option=="F")
+#if($vm.field62Option=='F')
 :62F:$vm.field62
-#elseif($vm.field62Option=="M")
+#elseif($vm.field62Option=='M')
 :62M:$vm.field62
 #end
-#if(!$null.isNull($vm.field64) && $vm.field64.length() > 0)
+#if(!$null.isNull($vm.field64) && $vm.field64.length()>0)
 :64:$vm.field64
 #end
--}{5:{MAC:6342F3D2}{CHK:C412E5AF7797}{DLM:}}
+#if(!$null.isNull($vm.field65) && $vm.field65.length()>0)
+:65:$vm.field65
+#end
+#if(!$null.isNull($vm.field86) && $vm.field86.length()>0)
+:86:$vm.field86
+#end
+-}#if(!$null.isNull($vm.head5) && $vm.head5.length()>0){5:$vm.head5}#end
\ No newline at end of file