| @@ -182,6 +182,14 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||
| wxFinancePrintTemplateMapper.updateById(record); | |||
| } | |||
| private boolean isSetDefaultValue(JSONObject component) { | |||
| boolean isSetDefaultValue = false; | |||
| String componentType = component.getString("type"); | |||
| if ("braid-html".equals(componentType)) { | |||
| isSetDefaultValue = true; | |||
| } | |||
| return isSetDefaultValue; | |||
| } | |||
| @Override | |||
| public List<PrintVo> parseTemplateData(String tenantId, Long templateId, List<Long> dataIds,Object entity) { | |||
| @@ -236,6 +244,8 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||
| JSONObject ov = items.getJSONObject(j); | |||
| //是否是定制化的表格 | |||
| Integer isCustomedTable = ov.getInteger("isFmCustomizedTable"); | |||
| boolean isSetDefaultValue = isSetDefaultValue(ov); | |||
| if (null != isCustomedTable && EnumYesOrNo.YES.getCode().intValue() == isCustomedTable.intValue()) { | |||
| //表格解析 | |||
| String componentContent = ov.getString("value"); | |||
| @@ -243,7 +253,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||
| ov.put("defaultValue",printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(billList)),JSON.parseObject(JSON.toJSONString(re)))); | |||
| } | |||
| }else { | |||
| ov.put("defaultValue", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); | |||
| if (isSetDefaultValue) { | |||
| ov.put("defaultValue", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); | |||
| }else { | |||
| ov.put("defaultValue", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| @@ -270,11 +284,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||
| //是否是定制化的表格 | |||
| Integer isCustomedTable = ov.getInteger("isFmCustomizedTable"); | |||
| boolean isSetDefaultValue = false; | |||
| String componentType = ov.getString("type"); | |||
| if ("braid-html".equals(componentType)) { | |||
| isSetDefaultValue = true; | |||
| } | |||
| boolean isSetDefaultValue = isSetDefaultValue(ov); | |||
| if (null != isCustomedTable && EnumYesOrNo.YES.getCode().intValue() == isCustomedTable.intValue()) { | |||
| //表格解析 | |||
| String componentContent = ov.getString("value"); | |||
| @@ -283,9 +293,9 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||
| //} | |||
| }else { | |||
| if (isSetDefaultValue) { | |||
| ov.put("value", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); | |||
| ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); | |||
| }else { | |||
| ov.put("value", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); | |||
| ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); | |||
| } | |||
| } | |||
| @@ -308,6 +318,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||
| JSONObject ov = items.getJSONObject(j); | |||
| //是否是定制化的表格 | |||
| Integer isCustomedTable = ov.getInteger("isFmCustomizedTable"); | |||
| boolean isSetDefaultValue = isSetDefaultValue(ov); | |||
| if (null != isCustomedTable && EnumYesOrNo.YES.getCode().intValue() == isCustomedTable.intValue()) { | |||
| //表格解析 | |||
| List<WxBillSum> sumlist = new ArrayList<WxBillSum>(); | |||
| @@ -346,7 +357,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||
| ov.put("defaultValue",printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(sumlist)),JSON.parseObject(JSON.toJSONString(bq)))); | |||
| } | |||
| }else { | |||
| ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); | |||
| if (isSetDefaultValue) { | |||
| ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); | |||
| }else { | |||
| ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); | |||
| } | |||
| } | |||
| } | |||