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:15:35 +08:00
parent 6228ecd72d
commit 9b7108c2d0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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+"],"; feeItemRemark=feeItemRemark+"|"+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+"-"+feeitem.getRemark();
} }
} }
@ -554,6 +554,9 @@ public class EmisSettleBillController extends BaseController
voMap.put("declareFee",declareFeeStr); voMap.put("declareFee",declareFeeStr);
voMap.put("otherFee",otherFeeStr); voMap.put("otherFee",otherFeeStr);
if(!StringUtils.isEmpty(feeItemRemark)){
feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,",");
}
feeRemark=feeRemark+","+feeItemRemark; feeRemark=feeRemark+","+feeItemRemark;
feeRemark=StringUtils.removeEnd(feeRemark,","); feeRemark=StringUtils.removeEnd(feeRemark,",");