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 06:32:04 +08:00
parent 023a6e0d6d
commit 9c35042d7d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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