diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java index 57bb4755f..07be86f3a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java @@ -164,22 +164,15 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm EmisSettleSubBill billItem = getSettleSubBillBySubBillNo(emisWaybillOld.getBillCode()); List feeItemList = billItem.getFeeitemList(); - List> listMap = new ArrayList<>(); if (!CollectionUtils.isEmpty(feeItemList)) { for (EmisSettleSubBillFeeitem feeitem : feeItemList) { - Map voMap = new HashMap<>(); - voMap.put("feeName", feeitem.getFeeName()); - voMap.put("fee", feeitem.getBillFee().stripTrailingZeros().toPlainString()); - voMap.put("currency", feeitem.getCurrency()); - listMap.add(voMap); - if("2004".equals(feeitem.getFeeCode())){ dutyFee=feeitem.getBillFee(); dutyFeeCurrency = feeitem.getCurrency(); } } } - fillMap.put("feeList", listMap); + fillMap.put("feeList", feeItemList); fillMap.put("totalFee", billItem.getBillFee().stripTrailingZeros().toPlainString()); fillMap.put("dutyFee", dutyFee.stripTrailingZeros().toPlainString()); fillMap.put("dutyFeeCurrency", dutyFeeCurrency);