|
|
|
@@ -250,11 +250,11 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
//表格解析 |
|
|
|
String componentContent = ov.getString("value"); |
|
|
|
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 { |
|
|
|
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 { |
|
|
|
ov.put("value", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); |
|
|
|
} |
|
|
|
@@ -295,7 +295,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
if (isSetDefaultValue) { |
|
|
|
ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); |
|
|
|
}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) { |
|
|
|
ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); |
|
|
|
}else { |
|
|
|
ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); |
|
|
|
ov.put("value", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|