From 2225a09ed66895bdaa128fbc7648376e7fa99152 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 26 Aug 2024 06:56:16 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisSettleBillController.java    | 19 ++++++++++++++++++-
 1 file changed, 18 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 6f8e114cf..325813345 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
@@ -465,7 +465,7 @@ public class EmisSettleBillController extends BaseController
                     BigDecimal declareFee = BigDecimal.ZERO;
 
 
-                    String transFeeStr = "";
+                    String transFeeStr = "0";
                     String cebFeeStr = "";
                     String declareFeeStr = "";
                     String otherFeeStr = "";
@@ -494,12 +494,29 @@ public class EmisSettleBillController extends BaseController
                     }
 //                    voMap.put("transFee", transFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : transFee.stripTrailingZeros().toPlainString());
                     voMap.put("transFee", transFeeStr);
+                    if(StringUtils.isEmpty(transFeeStr)){
+                        transFeeStr="0(CNY)";
+                    }
+
                     if( cebFee.compareTo(BigDecimal.ZERO)!=0 || declareFee.compareTo(BigDecimal.ZERO)!=0 || otherFee.compareTo(BigDecimal.ZERO)!=0 ) {
                         tplName = "tpl/bill_tpl.xlsx";
 //                        voMap.put("cebFee", cebFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : cebFee.stripTrailingZeros().toPlainString());
 //                        voMap.put("declareFee", declareFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : declareFee.stripTrailingZeros().toPlainString());
 //                        voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : otherFee.stripTrailingZeros().toPlainString());
 
+                          if(StringUtils.isEmpty(cebFeeStr)){
+                              cebFeeStr="0(CNY)";
+                          }
+
+                          if(StringUtils.isEmpty(declareFeeStr)){
+                            cebFeeStr="0(CNY)";
+                          }
+
+                          if(StringUtils.isEmpty(otherFee)){
+                              otherFee="0(CNY)";
+                          }
+
+
                           voMap.put("cebFee", cebFeeStr);
                           voMap.put("declareFee", declareFeeStr);
                           voMap.put("otherFee", StringUtils.removeEnd(otherFeeStr,","));