From 95fcb8d31bdbd936b1d8055f5e517de0e29f34c2 Mon Sep 17 00:00:00 2001 From: xiezw Date: Thu, 26 Sep 2024 14:02:57 +0800 Subject: [PATCH] =?UTF-8?q?20240926-=E6=8A=A5=E8=A1=A8=E5=B0=96=E5=B3=B0?= =?UTF-8?q?=E5=B9=B3=E8=B0=B7=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carbon/peakvalley/service/impl/PeakValleyServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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());