|
|
|
@@ -240,10 +240,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
//表格解析 |
|
|
|
String componentContent = ov.getString("value"); |
|
|
|
if (null != billList) { |
|
|
|
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 { |
|
|
|
ov.put("value", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); |
|
|
|
ov.put("defaultValue", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -276,7 +276,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
// printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(billList))); |
|
|
|
//} |
|
|
|
}else { |
|
|
|
ov.put("value", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); |
|
|
|
ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
@@ -333,10 +333,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
|
|
|
|
String componentContent = ov.getString("value"); |
|
|
|
if (null != sumlist && sumlist.size() > 0 ) { |
|
|
|
printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(sumlist)),JSON.parseObject(JSON.toJSONString(bq))); |
|
|
|
ov.put("defaultValue",printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(sumlist)),JSON.parseObject(JSON.toJSONString(bq)))); |
|
|
|
} |
|
|
|
}else { |
|
|
|
ov.put("value", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); |
|
|
|
ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|