From 81bfae4ef9cc53a26186c5b9686aa21a4bfdba9f Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 10 Aug 2024 00:27:13 +0800 Subject: [PATCH] fix --- .../print/data/PrintCustomedTableDataHandler.java | 3 ++- .../service/impl/WxFinancePrintServiceImpl.java | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java index d0cb93a19..c7a0043b9 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/PrintCustomedTableDataHandler.java @@ -83,7 +83,8 @@ public class PrintCustomedTableDataHandler{ } sb.append(""); } - return sb.toString(); + titleTr.parent().appendText(sb.toString()); + return doc.html(); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index 2581133ee..b2e134cb8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -269,6 +269,12 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { JSONObject ov = items.getJSONObject(j); //是否是定制化的表格 Integer isCustomedTable = ov.getInteger("isFmCustomizedTable"); + + boolean isSetDefaultValue = false; + String componentType = ov.getString("type"); + if ("braid-html".equals(componentType)) { + isSetDefaultValue = true; + } if (null != isCustomedTable && EnumYesOrNo.YES.getCode().intValue() == isCustomedTable.intValue()) { //表格解析 String componentContent = ov.getString("value"); @@ -276,7 +282,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { // printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(billList))); //} }else { - ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); + if (isSetDefaultValue) { + ov.put("value", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); + }else { + ov.put("value", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); + } } }