|
|
|
@@ -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)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|