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-26 06:56:16 +08:00
parent dffc2dddfd
commit 2225a09ed6
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,7 +465,7 @@ public class EmisSettleBillController extends BaseController
BigDecimal declareFee = BigDecimal.ZERO; BigDecimal declareFee = BigDecimal.ZERO;
String transFeeStr = ""; String transFeeStr = "0";
String cebFeeStr = ""; String cebFeeStr = "";
String declareFeeStr = ""; String declareFeeStr = "";
String otherFeeStr = ""; 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", transFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : transFee.stripTrailingZeros().toPlainString());
voMap.put("transFee", transFeeStr); 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 ) { if( cebFee.compareTo(BigDecimal.ZERO)!=0 || declareFee.compareTo(BigDecimal.ZERO)!=0 || otherFee.compareTo(BigDecimal.ZERO)!=0 ) {
tplName = "tpl/bill_tpl.xlsx"; tplName = "tpl/bill_tpl.xlsx";
// voMap.put("cebFee", cebFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : cebFee.stripTrailingZeros().toPlainString()); // 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("declareFee", declareFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : declareFee.stripTrailingZeros().toPlainString());
// voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : otherFee.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("cebFee", cebFeeStr);
voMap.put("declareFee", declareFeeStr); voMap.put("declareFee", declareFeeStr);
voMap.put("otherFee", StringUtils.removeEnd(otherFeeStr,",")); voMap.put("otherFee", StringUtils.removeEnd(otherFeeStr,","));