diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 4445bca39..092ffef69 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2492,9 +2492,13 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { vo.setTotalElectricity(totalElectricity.toString()); if (detailInfo != null) { vo.setTotalPeakUsedElectricity(detailInfo.getTotalPeakUsedElectricity()); + vo.setTotalSharpAmount(detailInfo.getTotalSharpAmount()); vo.setTotalFlatUsedElectricity(detailInfo.getTotalFlatUsedElectricity()); + vo.setTotalPeakAmount(detailInfo.getTotalPeakAmount()); vo.setTotalSharpUsedElectricity(detailInfo.getTotalSharpUsedElectricity()); + vo.setTotalFlatAmount(detailInfo.getTotalFlatAmount()); vo.setTotalValleyUsedElectricity(detailInfo.getTotalValleyUsedElectricity()); + vo.setTotalValleyAmount(detailInfo.getTotalValleyAmount()); } resultList.add(vo); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java index f5127e9ce..ab5a7033c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexOrderInfoVO.java @@ -35,19 +35,39 @@ public class IndexOrderInfoVO { */ private String totalSharpUsedElectricity; + /** + * 尖时段总金额 + */ + private String totalSharpAmount; + /** * 峰时段总用电量 */ private String totalPeakUsedElectricity; + /** + * 峰时段总金额 + */ + private String totalPeakAmount; + /** * 平时段总用电量 */ private String totalFlatUsedElectricity; + /** + * 平时段总金额 + */ + private String totalFlatAmount; + /** * 谷时段总用电量 */ private String totalValleyUsedElectricity; + /** + * 谷时段总金额 + */ + private String totalValleyAmount; + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 53e4cfc8c..fd358de4a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2802,9 +2802,13 @@