mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理除数为0

master
OathK1per 2022-01-05 16:16:57 +08:00
parent d67bffcdbf
commit 2235157936
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/palmte/work/bean/FinalBean.java
View File

@ -161,6 +161,9 @@ public class FinalBean {
if(null == grossProfitFinalTotal || null == incomeTotal){ if(null == grossProfitFinalTotal || null == incomeTotal){
return null; return null;
} }
if (incomeTotal.compareTo(BigDecimal.valueOf(0.01)) < 0) {
incomeTotal = BigDecimal.ONE;
}
return grossProfitFinalTotal.divide(incomeTotal,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); return grossProfitFinalTotal.divide(incomeTotal,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
} }
@ -199,7 +202,9 @@ public class FinalBean {
if(null == contributionMarginFinalTotal || null == incomeTotal){ if(null == contributionMarginFinalTotal || null == incomeTotal){
return null; return null;
} }
if (incomeTotal.compareTo(BigDecimal.valueOf(0.01)) < 0) {
incomeTotal = BigDecimal.ONE;
}
return contributionMarginFinalTotal.divide(incomeTotal,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); return contributionMarginFinalTotal.divide(incomeTotal,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
} }
@ -237,6 +242,9 @@ public class FinalBean {
if(null == netMarginFinalTotal || null == incomeTotal){ if(null == netMarginFinalTotal || null == incomeTotal){
return null; return null;
} }
if (incomeTotal.compareTo(BigDecimal.valueOf(0.01)) < 0) {
incomeTotal = BigDecimal.ONE;
}
return netMarginFinalTotal.divide(incomeTotal,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); return netMarginFinalTotal.divide(incomeTotal,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
} }

6
src/main/resources/static/assets/js/project_final.js
View File

@ -320,7 +320,7 @@ function calGrossProfitProfitMargin() {
var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']"); var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
if (grossProfitFinalTotal && incomeFinalTotal) { if (grossProfitFinalTotal && incomeFinalTotal) {
grossProfitProfitMargin.val(f2(100 * grossProfitFinalTotal / incomeFinalTotal)); grossProfitProfitMargin.val(f2(100 * parseFloat(grossProfitFinalTotal) / parseFloat(incomeFinalTotal)));
} else { } else {
grossProfitProfitMargin.val(""); grossProfitProfitMargin.val("");
} }
@ -352,7 +352,7 @@ function calContributionMarginProfitMargin() {
var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']"); var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']");
if (contributionMarginFinalTotal && incomeFinalTotal) { if (contributionMarginFinalTotal && incomeFinalTotal) {
contributionMarginProfitMargin.val(f2(100 * contributionMarginFinalTotal / incomeFinalTotal)); contributionMarginProfitMargin.val(f2(100 * parseFloat(contributionMarginFinalTotal) / parseFloat(incomeFinalTotal)));
} else { } else {
contributionMarginProfitMargin.val(""); contributionMarginProfitMargin.val("");
} }
@ -384,7 +384,7 @@ function calNetMarginProfitMargin() {
var netMarginProfitMargin = $("input[name='netMarginProfitMargin']"); var netMarginProfitMargin = $("input[name='netMarginProfitMargin']");
if (netMarginFinalTotal && incomeFinalTotal) { if (netMarginFinalTotal && incomeFinalTotal) {
netMarginProfitMargin.val(f2(100 * netMarginFinalTotal / incomeFinalTotal)); netMarginProfitMargin.val(f2(100 * parseFloat(netMarginFinalTotal) / parseFloat(incomeFinalTotal)));
} else { } else {
netMarginProfitMargin.val(""); netMarginProfitMargin.val("");
} }