This commit is contained in:
2023-11-07 21:06:17 +08:00
parent 8f8fe39b73
commit 5f2a1581e7

View File

@@ -130,15 +130,14 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
totalWeight1 += currWeight; totalWeight1 += currWeight;
avgSum1 += ObjectUtils.defaultIfNull(inputItem.getAvgDdp1(), 0.0) * currWeight; avgSum1 += ObjectUtils.defaultIfNull(inputItem.getAvgDdp1(), 0.0) * currWeight;
inputItem.setRollingAvgDdp1(avgSum1 / totalWeight1);
} }
inputItem.setRollingAvgDdp1(avgSum1 / totalWeight1);
if (inputItem.getAvgDdp2() != null) { if (inputItem.getAvgDdp2() != null) {
totalWeight2 += currWeight; totalWeight2 += currWeight;
avgSum2 += ObjectUtils.defaultIfNull(inputItem.getAvgDdp2(), 0.0) * currWeight; avgSum2 += ObjectUtils.defaultIfNull(inputItem.getAvgDdp2(), 0.0) * currWeight;
inputItem.setRollingAvgDdp2(avgSum2 / totalWeight2);
} }
inputItem.setRollingAvgDdp2(avgSum2 / totalWeight2);
} }
for (int i = 0; i < inputItems.size(); i++) { for (int i = 0; i < inputItems.size(); i++) {