From 9c35042d7df6467647d789425989108ea6e0de99 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 27 Aug 2024 06:32:04 +0800
Subject: [PATCH] md

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

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 42446cb1a..1a398355e 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
@@ -439,6 +439,9 @@ public class EmisSettleBillController extends BaseController
 
             String tplName="tpl/bill_tpl_simple.xlsx";
 
+            // 是否使用复复杂模版，如果有清关费用和其他费用都需要使用复杂模版
+            boolean isNeedComplexTpl=false;
+
             List<Map<String, Object>>  listMap=new ArrayList<>();
             for(EmisSettleSubBill billItem:list){
                 Map<String, Object> voMap = new HashMap<>();
@@ -464,9 +467,6 @@ public class EmisSettleBillController extends BaseController
                 String declareFeeStr = "";
                 String otherFeeStr = "";
 
-                // 是否使用复复杂模版，如果有清关费用和其他费用都需要使用复杂模版
-                boolean isNeedComplexTpl=false;
-
                  //计算分项数据
                 List<EmisSettleSubBillFeeitem>  feeItemList=billItem.getFeeitemList();
                 if( !CollectionUtils.isEmpty(feeItemList) ){
@@ -540,7 +540,6 @@ public class EmisSettleBillController extends BaseController
             }
 
 
-
             if(isNeedComplexTpl) {
                 tplName = "tpl/bill_tpl.xlsx";
             }else{