diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisItemVo.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisItemVo.java index ae596c0f..36569727 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisItemVo.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisItemVo.java @@ -307,8 +307,10 @@ public class CoalWashingDailyAnalysisItemVo { if (count2 == 0) sysDdp2 = null; if (StringUtils.equals(type, "2")) { - ddp1 = (1 + (sysDdp1 - prev.getSysDdp1()) / prev.getSysDdp1()) * prev.ddp1; - ddp2 = (1 + (sysDdp2 - prev.getSysDdp2()) / prev.getSysDdp1()) * prev.ddp2; + if (prev.getSysDdp1() != null && prev.ddp1 != null && sysDdp1 != null) + ddp1 = (1 + (sysDdp1 - prev.getSysDdp1()) / prev.getSysDdp1()) * prev.ddp1; + if (prev.getSysDdp2() != null && prev.ddp2 != null && sysDdp2 != null) + ddp2 = (1 + (sysDdp2 - prev.getSysDdp2()) / prev.getSysDdp2()) * prev.ddp2; } if (ddp1 != null && sysDdp1 != null) avgDdp1 = (ddp1 + sysDdp1) / 2.0;