This commit is contained in:
2023-11-07 20:39:10 +08:00
parent 6f6a8ac2ba
commit 1d12ebfe18

View File

@@ -195,12 +195,12 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
item.setSysDdAvgP1( item.setSysDdAvgP1(
ObjectUtils.defaultIfNull(inputItems.get(j).getSysDdp1(), 0.0) ObjectUtils.defaultIfNull(inputItems.get(j).getSysDdp1(), 0.0)
+ item.getFddAvgP1()); + item.getSysDdAvgP1());
} }
} }
if (i - nullCount + 1 > 0) { if (i - nullCount + 1 > 0) {
item.setSysDdAvgP1(item.getFddAvgP1() / (double) (i - nullCount + 1)); item.setSysDdAvgP1(item.getSysDdAvgP1() / (double) (i - nullCount + 1));
} else { } else {
item.setSysDdAvgP1(null); item.setSysDdAvgP1(null);
} }
@@ -219,12 +219,12 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
item.setSysDdAvgP2( item.setSysDdAvgP2(
ObjectUtils.defaultIfNull(inputItems.get(j).getSysDdp2(), 0.0) ObjectUtils.defaultIfNull(inputItems.get(j).getSysDdp2(), 0.0)
+ item.getFddAvgP2()); + item.getSysDdAvgP2());
} }
} }
if (i - nullCount + 1 > 0) { if (i - nullCount + 1 > 0) {
item.setSysDdAvgP2(item.getFddAvgP2() / (double) (i - nullCount + 1)); item.setSysDdAvgP2(item.getSysDdAvgP2() / (double) (i - nullCount + 1));
} else { } else {
item.setSysDdAvgP2(null); item.setSysDdAvgP2(null);
} }
@@ -243,12 +243,12 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
item.setDdAvgP1( item.setDdAvgP1(
ObjectUtils.defaultIfNull(inputItems.get(j).getDdp1(), 0.0) ObjectUtils.defaultIfNull(inputItems.get(j).getDdp1(), 0.0)
+ item.getFddAvgP1()); + item.getDdAvgP1());
} }
} }
if (i - nullCount + 1 > 0) { if (i - nullCount + 1 > 0) {
item.setDdAvgP1(item.getFddAvgP1() / (double) (i - nullCount + 1)); item.setDdAvgP1(item.getDdAvgP1() / (double) (i - nullCount + 1));
} else { } else {
item.setDdAvgP1(null); item.setDdAvgP1(null);
} }
@@ -267,12 +267,12 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
item.setDdAvgP2( item.setDdAvgP2(
ObjectUtils.defaultIfNull(inputItems.get(j).getDdp2(), 0.0) ObjectUtils.defaultIfNull(inputItems.get(j).getDdp2(), 0.0)
+ item.getFddAvgP2()); + item.getDdAvgP2());
} }
} }
if (i - nullCount + 1 > 0) { if (i - nullCount + 1 > 0) {
item.setDdAvgP2(item.getFddAvgP2() / (double) (i - nullCount + 1)); item.setDdAvgP2(item.getDdAvgP2() / (double) (i - nullCount + 1));
} else { } else {
item.setDdAvgP2(null); item.setDdAvgP2(null);
} }