| @@ -250,11 +250,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||||
| //表格解析 | //表格解析 | ||||
| String componentContent = ov.getString("value"); | String componentContent = ov.getString("value"); | ||||
| if (null != billList) { | if (null != billList) { | ||||
| ov.put("value",printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(billList)),JSON.parseObject(JSON.toJSONString(re)))); | |||||
| ov.put("defaultValue",printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(billList)),JSON.parseObject(JSON.toJSONString(re)))); | |||||
| } | } | ||||
| }else { | }else { | ||||
| if (isSetDefaultValue) { | if (isSetDefaultValue) { | ||||
| ov.put("value", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); | |||||
| ov.put("defaultValue", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); | |||||
| }else { | }else { | ||||
| ov.put("value", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); | ov.put("value", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); | ||||
| } | } | ||||
| @@ -295,7 +295,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||||
| if (isSetDefaultValue) { | if (isSetDefaultValue) { | ||||
| ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); | ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); | ||||
| }else { | }else { | ||||
| ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); | |||||
| ov.put("value", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); | |||||
| } | } | ||||
| } | } | ||||
| @@ -360,7 +360,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { | |||||
| if (isSetDefaultValue) { | if (isSetDefaultValue) { | ||||
| ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); | ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); | ||||
| }else { | }else { | ||||
| ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); | |||||
| ov.put("value", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); | |||||
| } | } | ||||
| } | } | ||||