aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-27 07:23:32 +08:00
parent 9b7108c2d0
commit 0f08bcff9e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -490,7 +490,7 @@ public class EmisSettleBillController extends BaseController
feeitem.setCurrency("CNY"); feeitem.setCurrency("CNY");
} }
if(!"CNY".equals(feeitem.getCurrency())){ 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(!StringUtils.isEmpty(feeitem.getRemark())){
if(!feeitem.getRemark().contains("w")){ 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); voMap.put("otherFee",otherFeeStr);
if(!StringUtils.isEmpty(feeItemRemark)){ if(!StringUtils.isEmpty(feeItemRemark)){
feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,","); feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,"|");
} }
feeRemark=feeRemark+","+feeItemRemark; feeRemark=feeRemark+","+feeItemRemark;
feeRemark=StringUtils.removeEnd(feeRemark,","); feeRemark=StringUtils.removeEnd(feeRemark,",");