| @@ -31,8 +31,8 @@ public class PrintComponentHandler implements Serializable { | |||||
| } | } | ||||
| public static Object parseComponent(WxFinancePrintData data) { | public static Object parseComponent(WxFinancePrintData data) { | ||||
| JSONObject dataJson = JSON.parseObject(data.getPrintDataJson()); | |||||
| if("braid-txt".equals(data.getPrintDataType())) { | if("braid-txt".equals(data.getPrintDataType())) { | ||||
| JSONObject dataJson = JSON.parseObject(data.getPrintDataJson()); | |||||
| PrintBraidTxt txt = new PrintBraidTxt(); | PrintBraidTxt txt = new PrintBraidTxt(); | ||||
| txt.setTitle(data.getName()); | txt.setTitle(data.getName()); | ||||
| txt.setIsEdit(data.getIsEdit()); | txt.setIsEdit(data.getIsEdit()); | ||||
| @@ -41,6 +41,7 @@ public class PrintComponentHandler implements Serializable { | |||||
| txt.setDefaultValue(txt.getTitle()); | txt.setDefaultValue(txt.getTitle()); | ||||
| return txt; | return txt; | ||||
| }else if ("braid-table".equals(data.getPrintDataType())) { | }else if ("braid-table".equals(data.getPrintDataType())) { | ||||
| JSONObject dataJson = JSON.parseObject(data.getPrintDataJson()); | |||||
| PrintBraidTable table = new PrintBraidTable(); | PrintBraidTable table = new PrintBraidTable(); | ||||
| table.setTitle(data.getName()); | table.setTitle(data.getName()); | ||||
| table.setIsEdit(data.getIsEdit()); | table.setIsEdit(data.getIsEdit()); | ||||
| @@ -78,14 +79,14 @@ public class PrintComponentHandler implements Serializable { | |||||
| PrintHtml html = new PrintHtml(); | PrintHtml html = new PrintHtml(); | ||||
| html.setTitle(data.getName()); | html.setTitle(data.getName()); | ||||
| html.setIsEdit(data.getIsEdit()); | html.setIsEdit(data.getIsEdit()); | ||||
| html.setValue(dataJson.getString("html")); | |||||
| html.setValue(data.getPrintDataJson()); | |||||
| html.setDefaultValue(data.getDefaultValue()); | html.setDefaultValue(data.getDefaultValue()); | ||||
| return html; | return html; | ||||
| }else if ("braid-html-table".equals(data.getPrintDataType())) { | }else if ("braid-html-table".equals(data.getPrintDataType())) { | ||||
| PrintHtml html = new PrintHtml(); | PrintHtml html = new PrintHtml(); | ||||
| html.setTitle(data.getName()); | html.setTitle(data.getName()); | ||||
| html.setIsEdit(data.getIsEdit()); | html.setIsEdit(data.getIsEdit()); | ||||
| html.setValue(dataJson.getString("html")); | |||||
| html.setValue(data.getPrintDataJson()); | |||||
| html.setIsFmCustomizedTable(EnumYesOrNo.YES.getCode()); | html.setIsFmCustomizedTable(EnumYesOrNo.YES.getCode()); | ||||
| html.setDefaultValue(data.getDefaultValue()); | html.setDefaultValue(data.getDefaultValue()); | ||||
| return html; | return html; | ||||