md
This commit is contained in:
parent
6228ecd72d
commit
9b7108c2d0
@ -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,",");
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user