|
@@ -613,6 +613,7 @@ public class AsyncTask {
|
|
|
for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons1) {
|
|
|
BigDecimal hsForecastOne = tXinyiForecastComparison.getHsForecastOne();
|
|
|
BigDecimal yyForecastOne = tXinyiForecastComparison.getYyForecastOne();
|
|
|
+ BigDecimal jlForecastOne = tXinyiForecastComparison.getJlForecastOne();
|
|
|
/*if(XSY1.equals(tXinyiForecastComparison.getCategory())){
|
|
|
tXinyiForecastComparison.setRealOne(no3Hlj1Jqr);
|
|
|
if(!Objects.isNull(no3Hlj1Jqr) && no3Hlj1Jqr.compareTo(BigDecimal.ZERO) > 0){
|
|
@@ -647,6 +648,11 @@ public class AsyncTask {
|
|
|
tXinyiForecastComparison.setYyErrorRateOne((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
tXinyiForecastComparison.setYyOneSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
}
|
|
|
+ if(!Objects.isNull(jlForecastOne)){
|
|
|
+ BigDecimal subtract = no3Hlj1Jqr.subtract(jlForecastOne);
|
|
|
+ tXinyiForecastComparison.setJlErrorRateOne((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
+ tXinyiForecastComparison.setJlOneSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -664,6 +670,11 @@ public class AsyncTask {
|
|
|
tXinyiForecastComparison.setYyErrorRateOne((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
tXinyiForecastComparison.setYyOneSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
}
|
|
|
+ if(!Objects.isNull(jlForecastOne)){
|
|
|
+ BigDecimal subtract = no3Hlj2Jqr.subtract(jlForecastOne);
|
|
|
+ tXinyiForecastComparison.setJlErrorRateOne((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
+ tXinyiForecastComparison.setJlOneSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -761,6 +772,7 @@ public class AsyncTask {
|
|
|
for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons2) {
|
|
|
BigDecimal hsForecastTwo = tXinyiForecastComparison.getHsForecastTwo();
|
|
|
BigDecimal yyForecastTwo = tXinyiForecastComparison.getYyForecastTwo();
|
|
|
+ BigDecimal jlForecastTwo = tXinyiForecastComparison.getJlForecastTwo();
|
|
|
/*if(XSY1.equals(tXinyiForecastComparison.getCategory())){
|
|
|
tXinyiForecastComparison.setRealTwo(no3Hlj1Jqr);
|
|
|
if(!Objects.isNull(no3Hlj1Jqr) && no3Hlj1Jqr.compareTo(BigDecimal.ZERO) > 0){
|
|
@@ -795,6 +807,11 @@ public class AsyncTask {
|
|
|
tXinyiForecastComparison.setYyErrorRateTwo((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
tXinyiForecastComparison.setYyTwoSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
}
|
|
|
+ if(!Objects.isNull(jlForecastTwo)){
|
|
|
+ BigDecimal subtract = no3Hlj1Jqr.subtract(jlForecastTwo);
|
|
|
+ tXinyiForecastComparison.setJlErrorRateTwo((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
+ tXinyiForecastComparison.setJlTwoSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -812,6 +829,11 @@ public class AsyncTask {
|
|
|
tXinyiForecastComparison.setYyErrorRateTwo((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
tXinyiForecastComparison.setYyTwoSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
}
|
|
|
+ if(!Objects.isNull(jlForecastTwo)){
|
|
|
+ BigDecimal subtract = no3Hlj2Jqr.subtract(jlForecastTwo);
|
|
|
+ tXinyiForecastComparison.setJlErrorRateTwo((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
+ tXinyiForecastComparison.setJlTwoSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -908,6 +930,7 @@ public class AsyncTask {
|
|
|
for (TXinyiForecastComparison tXinyiForecastComparison : tXinyiForecastComparisons3) {
|
|
|
BigDecimal hsForecastThree = tXinyiForecastComparison.getHsForecastThree();
|
|
|
BigDecimal yyForecastThree = tXinyiForecastComparison.getYyForecastThree();
|
|
|
+ BigDecimal jlForecastThree = tXinyiForecastComparison.getJlForecastThree();
|
|
|
/*if(XSY1.equals(tXinyiForecastComparison.getCategory())){
|
|
|
tXinyiForecastComparison.setRealThree(no3Hlj1Jqr);
|
|
|
if(!Objects.isNull(no3Hlj1Jqr) && no3Hlj1Jqr.compareTo(BigDecimal.ZERO) > 0){
|
|
@@ -942,6 +965,11 @@ public class AsyncTask {
|
|
|
tXinyiForecastComparison.setYyErrorRateThree((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
tXinyiForecastComparison.setYyThreeSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
}
|
|
|
+ if(!Objects.isNull(jlForecastThree)){
|
|
|
+ BigDecimal subtract = no3Hlj1Jqr.subtract(jlForecastThree);
|
|
|
+ tXinyiForecastComparison.setJlErrorRateThree((subtract).divide(no3Hlj1Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
+ tXinyiForecastComparison.setJlThreeSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -959,6 +987,11 @@ public class AsyncTask {
|
|
|
tXinyiForecastComparison.setYyErrorRateThree((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
tXinyiForecastComparison.setYyThreeSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
}
|
|
|
+ if(!Objects.isNull(jlForecastThree)){
|
|
|
+ BigDecimal subtract = no3Hlj2Jqr.subtract(jlForecastThree);
|
|
|
+ tXinyiForecastComparison.setJlErrorRateThree((subtract).divide(no3Hlj2Jqr, NUMBER_SCALE_4, RoundingMode.HALF_UP));
|
|
|
+ tXinyiForecastComparison.setJlThreeSubtract(DecimalUtils.getAbsAndScale(subtract, INT_2));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|