拟报增加序号

editor_vue/src/iso/script/MsgCode.js

@@ -17233,6 +17233,65 @@ const MsgCodes = {
     label : "Telecom",
     value : "TELB"
   } ],
+  proprietary111: [ {
+    label : "GODX-货物贸易",
+    value : "GODX"
+  }, {
+    label : "STRX-服务贸易",
+    value : "STRX"
+  },{
+    label : "CTFX-资本项下",
+    value : "CTFX"
+  },{
+    label : "RMTX-个人汇款",
+    value : "RMTX"
+  }, {
+    label : "OTFX-其他",
+    value : "OTFX"
+  }, {
+    label : "WMCN-跨进理财通-北向通",
+    value : "WMCN"
+  }, {
+    label : "WMCS-跨境理财通-南向通",
+    value : "WMCS"
+  } ],
+  proprietary112: [ {
+    label : "GODX-货物贸易",
+    value : "GODX"
+  }, {
+    label : "STRX-服务贸易",
+    value : "STRX"
+  },{
+    label : "CTFX-资本项下",
+    value : "CTFX"
+  },{
+    label : "RMTX-个人汇款",
+    value : "RMTX"
+  }, {
+    label : "BINP-债券付息",
+    value : "BINP"
+  }, {
+    label : "FIFX-金融机构头寸调拨",
+    value : "FIFX"
+  }, {
+    label : "BDES-债卷还本付息",
+    value : "BDES"
+  }, {
+    label : "BPRR-债券还本金",
+    value : "BPRR"
+  }, {
+    label : "BISF-债卷发行手续费",
+    value : "BISF"
+  }, {
+    label : "BCAF-债卷兑付手续费",
+    value : "BCAF"
+  }, {
+    label : "CBCF-附息式债卷兑付手续费",
+    value : "CBCF"
+  },{
+    label : "OTFX-其他",
+    value : "OTFX"
+  },],
 };
 
 export default MsgCodes;
\ No newline at end of file

swift-service/src/main/java/com/brilliance/mxeditor/util/SwiftTransferUtil.java

@@ -92,7 +92,7 @@ public class SwiftTransferUtil {
      * @param sheetName
      */
     public static void generateJsTemplateFile(String sheetName) {
-        InputStream resourceAsStream = SwiftTransferUtil.class.getResourceAsStream("/js/SwiftIso.xlsx");
+        InputStream resourceAsStream = SwiftTransferUtil.class.getResourceAsStream("/js/CIPS.xlsx");
         ExcelReader reader = ExcelUtil.getReader(resourceAsStream, sheetName);
         List<Map<String, Object>> content = reader.readAll();
         if (content.size() > 0) {
@@ -124,10 +124,10 @@ public class SwiftTransferUtil {
                 if (contentMaps.get("defaultValue") != null) {
                     swiftIsoModel.setDefaultValue(String.valueOf(contentMaps.get("defaultValue")).trim());
                 }
-                if (contentMaps.get("array") != null) {
+                if (contentMaps.get("array") != null && contentMaps.get("array")!="") {
                     swiftIsoModel.setArray((Boolean) contentMaps.get("array"));
                 }
-                if (contentMaps.get("unable") != null) {
+                if (contentMaps.get("unable") != null &&contentMaps.get("unable")!="") {
                     swiftIsoModel.setUnable((Boolean) contentMaps.get("unable"));
                 }
                 if (contentMaps.get("pid") instanceof Long) {
@@ -260,7 +260,7 @@ public class SwiftTransferUtil {
     }
 
     public static void main(String[] args) throws Exception {
-        generateJsTemplateFile("Pacs.008.001.08");
+        generateJsTemplateFile("cips.112.001.02");
 //        generateBTCFile();
     }
 }