From 9b7108c2d0569ad56406c0522e3e2f11cd1e8a58 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 27 Aug 2024 07:15:35 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisSettleBillController.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 7c980e648..94072c30e 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
@@ -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+"],";
+                                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("otherFee",otherFeeStr);
 
+                if(!StringUtils.isEmpty(feeItemRemark)){
+                    feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,",");
+                }
                 feeRemark=feeRemark+","+feeItemRemark;
                 feeRemark=StringUtils.removeEnd(feeRemark,",");