lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 23:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加翻大堆平均

Browse Source
This commit is contained in:
lihongjie0209
2023-10-16 20:22:42 +08:00
parent e569041696
commit 026784c891
1 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java
View File

@@ -116,53 +116,49 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
for (int i = 0; i < inputItems.size(); i++) { for (int i = 0; i < inputItems.size(); i++) {
CoalWashingDailyAnalysisItemVo item = inputItems.get(i); CoalWashingDailyAnalysisItemVo item = inputItems.get(i);
if (i == 0) { item.setFddAvgP1(0.0);
item.setFddAvgP1(item.getFddp1());
} else {
int nullCount = 0;
for (int j = 0; j < i; j++) {
if (item.getFddp1() == null) {
nullCount++;
} else {
item.setFddAvgP1( int nullCount = 0;
ObjectUtils.defaultIfNull(item.getFddp1(), 0.0) for (int j = 0; j <= i; j++) {
+ inputItems.get(j).getFddAvgP1()); if (inputItems.get(j).getFddp1() == null) {
} nullCount++;
}
if (i - nullCount > 0) {
item.setFddAvgP1(item.getFddAvgP1() / (i - nullCount));
} else { } else {
item.setFddAvgP1(null);
item.setFddAvgP1(
ObjectUtils.defaultIfNull(inputItems.get(j).getFddp1(), 0.0)
+ item.getFddAvgP1());
} }
} }
if (i - nullCount + 1 > 0) {
item.setFddAvgP1(item.getFddAvgP1() / (double) (i - nullCount + 1));
} else {
item.setFddAvgP1(null);
}
} }
for (int i = 0; i < inputItems.size(); i++) { for (int i = 0; i < inputItems.size(); i++) {
CoalWashingDailyAnalysisItemVo item = inputItems.get(i); CoalWashingDailyAnalysisItemVo item = inputItems.get(i);
if (i == 0) { item.setFddAvgP2(0.0);
item.setFddAvgP2(item.getFddp2());
} else {
int nullCount = 0;
for (int j = 0; j < i; j++) {
if (item.getFddp2() == null) {
nullCount++;
} else {
item.setFddAvgP2( int nullCount = 0;
ObjectUtils.defaultIfNull(item.getFddp2(), 0.0) for (int j = 0; j <= i; j++) {
+ inputItems.get(j).getFddAvgP2()); if (inputItems.get(j).getFddp2() == null) {
} nullCount++;
}
if (i - nullCount > 0) {
item.setFddAvgP2(item.getFddAvgP2() / (i - nullCount));
} else { } else {
item.setFddAvgP2(null);
item.setFddAvgP2(
ObjectUtils.defaultIfNull(inputItems.get(j).getFddp2(), 0.0)
+ item.getFddAvgP2());
} }
} }
if (i - nullCount + 1 > 0) {
item.setFddAvgP2(item.getFddAvgP2() / (double) (i - nullCount + 1));
} else {
item.setFddAvgP2(null);
}
} }
} }
} }