diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java index 8311f6a..e350bee 100644 --- a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java +++ b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java @@ -595,11 +595,11 @@ public class PeakValleyServiceImpl implements PeakValleyService { }else if(temp.getAttrCode().contains("valley")){ temp.setAttrName(priceInfo.getValleyPriceBean()==null?"谷用"+priceInfo.getBaseName():priceInfo.getValleyPriceBean().getAttrName()); temp.setUintPrice(priceInfo.getValleyPriceBean()==null?BigDecimal.ZERO:priceInfo.getValleyPriceBean().getPrice()); - temp.setSort(3); + temp.setSort(4); }else if(temp.getAttrCode().contains("normal")){ temp.setAttrName(priceInfo.getNormalPriceBean()==null?"平用"+priceInfo.getBaseName():priceInfo.getNormalPriceBean().getAttrName()); temp.setUintPrice(priceInfo.getNormalPriceBean()==null?BigDecimal.ZERO:priceInfo.getNormalPriceBean().getPrice()); - temp.setSort(4); + temp.setSort(3); }else { temp.setAttrName(priceInfo.getBaseName()); temp.setUintPrice(priceInfo.getBasePrice());