diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index 94072c30e..318e2816d 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -490,7 +490,7 @@ public class EmisSettleBillController extends BaseController feeitem.setCurrency("CNY"); } if(!"CNY".equals(feeitem.getCurrency())){ - currencyStr="("+feeitem.getCurrency()+")"; + currencyStr=""+feeitem.getCurrency()+""; } // 费用细分 @@ -524,7 +524,7 @@ public class EmisSettleBillController extends BaseController if(!StringUtils.isEmpty(feeitem.getRemark())){ if(!feeitem.getRemark().contains("w")){ - feeItemRemark=feeItemRemark+"|"+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+"-"+feeitem.getRemark(); + feeItemRemark=feeItemRemark+"|"+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+"(费用说明:"+feeitem.getRemark()+")"; } } @@ -555,7 +555,7 @@ public class EmisSettleBillController extends BaseController voMap.put("otherFee",otherFeeStr); if(!StringUtils.isEmpty(feeItemRemark)){ - feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,","); + feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,"|"); } feeRemark=feeRemark+","+feeItemRemark; feeRemark=StringUtils.removeEnd(feeRemark,",");