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