diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 108bce6d1..7bc69c145 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -973,13 +973,13 @@ public abstract class AbstractProgramLogic implements InitializingBean { BigDecimal totalUsedElectricity = orderDetail.getTotalUsedElectricity(); // 尖时段用电量 - BigDecimal sharpUsedElectricity = orderDetail.getSharpUsedElectricity(); + BigDecimal sharpUsedElectricity = orderDetail.getSharpUsedElectricity() == null? BigDecimal.ZERO : orderDetail.getSharpUsedElectricity(); // 峰时段用电量 - BigDecimal peakUsedElectricity = orderDetail.getPeakUsedElectricity(); + BigDecimal peakUsedElectricity = orderDetail.getPeakUsedElectricity() == null? BigDecimal.ZERO : orderDetail.getPeakUsedElectricity(); // 平时段用电量 - BigDecimal flatUsedElectricity = orderDetail.getFlatUsedElectricity(); + BigDecimal flatUsedElectricity = orderDetail.getFlatUsedElectricity() == null? BigDecimal.ZERO : orderDetail.getFlatUsedElectricity(); // 谷时段用电量 - BigDecimal valleyUsedElectricity = orderDetail.getValleyUsedElectricity(); + BigDecimal valleyUsedElectricity = orderDetail.getValleyUsedElectricity() == null? BigDecimal.ZERO : orderDetail.getValleyUsedElectricity(); // 各时段用电量汇总 BigDecimal sumUsedElectricity = sharpUsedElectricity.add(peakUsedElectricity).add(flatUsedElectricity).add(valleyUsedElectricity);