From d278b1a52dad0e49ddc6663a3d4567e7e40e4f1c Mon Sep 17 00:00:00 2001 From: xiezw Date: Thu, 26 Sep 2024 09:42:22 +0800 Subject: [PATCH] =?UTF-8?q?20240925-=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=B0=96=E5=B3=B0=E8=B0=B7=E5=B9=B3=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../peakvalley/service/impl/PeakValleyServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 7dc3964..8311f6a 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 @@ -89,8 +89,8 @@ public class PeakValleyServiceImpl implements PeakValleyService { param.setDateType("dd"); } List attrList = new ArrayList<>(); - attrList.add(param.getKey()+"_peak"+param.getDateType()); attrList.add(param.getKey()+"_rush"+param.getDateType()); + attrList.add(param.getKey()+"_peak"+param.getDateType()); attrList.add(param.getKey()+"_valley"+param.getDateType()); attrList.add(param.getKey()+"_normal"+param.getDateType()); List tempList = queryList(param.getKey(),param.getThingCode(),attrList,startTs,endTs); @@ -587,11 +587,11 @@ public class PeakValleyServiceImpl implements PeakValleyService { if(temp.getAttrCode().contains("peak")){ temp.setAttrName(priceInfo.getPeakPriceBean()==null?"峰用"+priceInfo.getBaseName():priceInfo.getPeakPriceBean().getAttrName()); temp.setUintPrice(priceInfo.getPeakPriceBean()==null?BigDecimal.ZERO:priceInfo.getPeakPriceBean().getPrice()); - temp.setSort(1); + temp.setSort(2); }else if(temp.getAttrCode().contains("rush")){ temp.setAttrName(priceInfo.getRushPriceBean()==null?"尖用"+priceInfo.getBaseName():priceInfo.getRushPriceBean().getAttrName()); temp.setUintPrice(priceInfo.getRushPriceBean()==null?BigDecimal.ZERO:priceInfo.getRushPriceBean().getPrice()); - temp.setSort(2); + temp.setSort(1); }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());