diff --git a/src/main/java/cn/palmte/work/bean/FormerBean.java b/src/main/java/cn/palmte/work/bean/FormerBean.java index e405c65..694c66b 100644 --- a/src/main/java/cn/palmte/work/bean/FormerBean.java +++ b/src/main/java/cn/palmte/work/bean/FormerBean.java @@ -1,6 +1,7 @@ package cn.palmte.work.bean; import java.math.BigDecimal; +import java.math.RoundingMode; /** * @author Yuanping Zhang @@ -118,7 +119,7 @@ public class FormerBean extends IncomeCostBean{ if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) { return BigDecimal.ZERO; } - return grossProfit.divide(incomeTotalTaxExclude, 4).multiply(new BigDecimal(100)); + return grossProfit.divide(incomeTotalTaxExclude, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); } public void setGrossProfitProfitMargin(BigDecimal grossProfitProfitMargin) { @@ -141,7 +142,7 @@ public class FormerBean extends IncomeCostBean{ if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) { return BigDecimal.ZERO; } - return contributionProfit.divide(incomeTotalTaxExclude, 4).multiply(new BigDecimal(100)); + return contributionProfit.divide(incomeTotalTaxExclude, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); } @@ -165,7 +166,7 @@ public class FormerBean extends IncomeCostBean{ if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) { return BigDecimal.ZERO; } - return netProfit.divide(incomeTotalTaxExclude, 4).multiply(new BigDecimal(100)); + return netProfit.divide(incomeTotalTaxExclude, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); } public void setNetProfitProfitMargin(BigDecimal netProfitProfitMargin) {