除法运算时 保留4位
parent
875c239854
commit
99ed1976db
|
@ -1,6 +1,7 @@
|
||||||
package cn.palmte.work.bean;
|
package cn.palmte.work.bean;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.math.RoundingMode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Yuanping Zhang
|
* @author Yuanping Zhang
|
||||||
|
@ -118,7 +119,7 @@ public class FormerBean extends IncomeCostBean{
|
||||||
if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) {
|
if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) {
|
||||||
return BigDecimal.ZERO;
|
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) {
|
public void setGrossProfitProfitMargin(BigDecimal grossProfitProfitMargin) {
|
||||||
|
@ -141,7 +142,7 @@ public class FormerBean extends IncomeCostBean{
|
||||||
if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) {
|
if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) {
|
||||||
return BigDecimal.ZERO;
|
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) {
|
if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) {
|
||||||
return BigDecimal.ZERO;
|
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) {
|
public void setNetProfitProfitMargin(BigDecimal netProfitProfitMargin) {
|
||||||
|
|
Loading…
Reference in New Issue