diff --git a/src/main/java/cn/lihongjie/coal/entity/CoalWashingDailyAnalysisItemVo.java b/src/main/java/cn/lihongjie/coal/entity/CoalWashingDailyAnalysisItemVo.java index ad303f94..1afa0c92 100644 --- a/src/main/java/cn/lihongjie/coal/entity/CoalWashingDailyAnalysisItemVo.java +++ b/src/main/java/cn/lihongjie/coal/entity/CoalWashingDailyAnalysisItemVo.java @@ -235,27 +235,31 @@ public class CoalWashingDailyAnalysisItemVo { sysDdp1 = 0.0; sysDdp2 = 0.0; - if (c0p0 != null) sysDdp1 += c0p1 * c0p0 / 100.00; - if (c0p0 != null) sysDdp2 += c0p2 * c0p0 / 100.00; - if (c1p0 != null) sysDdp1 += c1p1 * c1p0 / 100.00; - if (c1p0 != null) sysDdp2 += c1p2 * c1p0 / 100.00; - if (c2p0 != null) sysDdp1 += c2p1 * c2p0 / 100.00; - if (c2p0 != null) sysDdp2 += c2p2 * c2p0 / 100.00; - if (c3p0 != null) sysDdp1 += c3p1 * c3p0 / 100.00; - if (c3p0 != null) sysDdp2 += c3p2 * c3p0 / 100.00; - if (c4p0 != null) sysDdp1 += c4p1 * c4p0 / 100.00; - if (c4p0 != null) sysDdp2 += c4p2 * c4p0 / 100.00; - if (c5p0 != null) sysDdp1 += c5p1 * c5p0 / 100.00; - if (c5p0 != null) sysDdp2 += c5p2 * c5p0 / 100.00; - if (c6p0 != null) sysDdp1 += c6p1 * c6p0 / 100.00; - if (c6p0 != null) sysDdp2 += c6p2 * c6p0 / 100.00; - if (c7p0 != null) sysDdp1 += c7p1 * c7p0 / 100.00; - if (c7p0 != null) sysDdp2 += c7p2 * c7p0 / 100.00; - if (c8p0 != null) sysDdp1 += c8p1 * c8p0 / 100.00; - if (c8p0 != null) sysDdp2 += c8p2 * c8p0 / 100.00; - if (c9p0 != null) sysDdp1 += c9p1 * c9p0 / 100.00; - if (c9p0 != null) sysDdp2 += c9p2 * c9p0 / 100.00; + int count1 = 0; + int count2 = 0; + if (c0p0 != null && c0p1!=null) {sysDdp1 += c0p1 * c0p0 / 100.00; count1++;} + if (c0p0 != null && c0p2!=null) {sysDdp2 += c0p2 * c0p0 / 100.00; count2++;} + if (c1p0 != null && c1p1!=null) {sysDdp1 += c1p1 * c1p0 / 100.00; count1++;} + if (c1p0 != null && c1p2!=null) {sysDdp2 += c1p2 * c1p0 / 100.00; count2++;} + if (c2p0 != null && c2p1!=null) {sysDdp1 += c2p1 * c2p0 / 100.00; count1++;} + if (c2p0 != null && c2p2!=null) {sysDdp2 += c2p2 * c2p0 / 100.00; count2++;} + if (c3p0 != null && c3p1!=null) {sysDdp1 += c3p1 * c3p0 / 100.00; count1++;} + if (c3p0 != null && c3p2!=null) {sysDdp2 += c3p2 * c3p0 / 100.00; count2++;} + if (c4p0 != null && c4p1!=null) {sysDdp1 += c4p1 * c4p0 / 100.00; count1++;} + if (c4p0 != null && c4p2!=null) {sysDdp2 += c4p2 * c4p0 / 100.00; count2++;} + if (c5p0 != null && c5p1!=null) {sysDdp1 += c5p1 * c5p0 / 100.00; count1++;} + if (c5p0 != null && c5p2!=null) {sysDdp2 += c5p2 * c5p0 / 100.00; count2++;} + if (c6p0 != null && c6p1!=null) {sysDdp1 += c6p1 * c6p0 / 100.00; count1++;} + if (c6p0 != null && c6p2!=null) {sysDdp2 += c6p2 * c6p0 / 100.00; count2++;} + if (c7p0 != null && c7p1!=null) {sysDdp1 += c7p1 * c7p0 / 100.00; count1++;} + if (c7p0 != null && c7p2!=null) {sysDdp2 += c7p2 * c7p0 / 100.00; count2++;} + if (c8p0 != null && c8p1!=null) {sysDdp1 += c8p1 * c8p0 / 100.00; count1++;} + if (c8p0 != null && c8p2!=null) {sysDdp2 += c8p2 * c8p0 / 100.00; count2++;} + if (c9p0 != null && c9p1!=null) {sysDdp1 += c9p1 * c9p0 / 100.00; count1++;} + if (c9p0 != null && c9p2!=null) {sysDdp2 += c9p2 * c9p0 / 100.00; count2++;} + if (count1==0) sysDdp1 = null; + if (count2==0) sysDdp2 = null; if (ddp1 != null && sysDdp1 != null) avgDdp1 = (ddp1 + sysDdp1) / 2.0; if (ddp2 != null && sysDdp2 != null) avgDdp2 = (ddp2 + sysDdp2) / 2.0; @@ -264,6 +268,7 @@ public class CoalWashingDailyAnalysisItemVo { if (ddp5 != null && sysDdp5 != null) avgDdp5 = (ddp5 + sysDdp5) / 2.0; + }