|
|
|
@@ -251,10 +251,12 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
String componentContent = ov.getString("value"); |
|
|
|
if (null != billList) { |
|
|
|
ov.put("defaultValue",printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(billList)),JSON.parseObject(JSON.toJSONString(re)))); |
|
|
|
ov.put("value", ""); |
|
|
|
} |
|
|
|
}else { |
|
|
|
if (isSetDefaultValue) { |
|
|
|
ov.put("defaultValue", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); |
|
|
|
ov.put("value", ""); |
|
|
|
}else { |
|
|
|
ov.put("value", printFinanceReceiveDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap,shopNumber)); |
|
|
|
} |
|
|
|
@@ -294,6 +296,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
}else { |
|
|
|
if (isSetDefaultValue) { |
|
|
|
ov.put("defaultValue", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); |
|
|
|
ov.put("value", ""); |
|
|
|
}else { |
|
|
|
ov.put("value", printBillDataHandler.getObjectValue(ov.getString("name"),re,merchantMap,feesMap)); |
|
|
|
} |
|
|
|
@@ -355,11 +358,12 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { |
|
|
|
String componentContent = ov.getString("value"); |
|
|
|
if (null != sumlist && sumlist.size() > 0 ) { |
|
|
|
ov.put("defaultValue",printCustomedTableDataHandler.getTableContent(componentContent, JSON.parseArray(JSON.toJSONString(sumlist)),JSON.parseObject(JSON.toJSONString(bq)))); |
|
|
|
ov.put("value", null); |
|
|
|
ov.put("value", ""); |
|
|
|
} |
|
|
|
}else { |
|
|
|
if (isSetDefaultValue) { |
|
|
|
ov.put("defaultValue", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); |
|
|
|
ov.put("value", ""); |
|
|
|
}else { |
|
|
|
ov.put("value", printMerchantSettleDataHandler.getObjectValue(ov.getString("name"),bq,merchantMap,feesMap)); |
|
|
|
} |
|
|
|
|