朱园亮 / xingyun-erp · Commits

Commit 3c3a11d0ec7669ca9063e142ad46d97366db3930

Authored by 房远帅
1 parent 1ac46e34

楚江ERP:合同-导出问题修改

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
... ... @@ -1246,8 +1246,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
1246 1246 dataMap.put("buyerName", data.getBuyerName());
1247 1247 dataMap.put("unitName", data.getUnit());
1248 1248 dataMap.put("totalQuantity", data.getTotalQuantity().setScale(0, RoundingMode.HALF_UP).toString());
1249   - dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax().setScale(2, RoundingMode.HALF_UP).toString());
1250   - dataMap.put("totalAmountIncludingTax", data.getTotalAmountIncludingTax().setScale(2, RoundingMode.HALF_UP).toString());
  1249 + dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax() == null ? "" : data.getTotalAmountExcludingTax().setScale(2, RoundingMode.HALF_UP).toString());
  1250 + dataMap.put("totalAmountIncludingTax", data.getTotalAmountIncludingTax() == null ? "" : data.getTotalAmountIncludingTax().setScale(2, RoundingMode.HALF_UP).toString());
1251 1251 dataMap.put("totalAmountCapital", data.getTotalAmountCapital());
1252 1252 dataMap.put("specialInstructions", data.getSpecialInstructions());
1253 1253 dataMap.put("depositInfo", data.getDepositInfo());
... ...