diff --git a/help/sql/ddl_1.0.0.sql b/help/sql/1ddl_1.0.0.sql similarity index 100% rename from help/sql/ddl_1.0.0.sql rename to help/sql/1ddl_1.0.0.sql diff --git a/help/sql/dml_1.0.0.sql b/help/sql/2dml_1.0.0.sql similarity index 100% rename from help/sql/dml_1.0.0.sql rename to help/sql/2dml_1.0.0.sql diff --git a/help/sql/dml_1.0.1.sql b/help/sql/3dml_1.0.1.sql similarity index 100% rename from help/sql/dml_1.0.1.sql rename to help/sql/3dml_1.0.1.sql 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..0c2f47f 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 @@ -151,7 +151,7 @@ public class PeakValleyServiceImpl implements PeakValleyService { }); //总量的集合 PeakValleyPriceStatisticsInfo statisticsInfo = new PeakValleyPriceStatisticsInfo(); - statisticsInfo.setAttrName("总用量"); + statisticsInfo.setAttrName("总用"+result.getBaseName()+"量"); statisticsInfo.setBaseName(result.getBaseName()); statisticsInfo.setAttrCode(result.getBaseCode()); statisticsInfo.setAllDosageRatio(BigDecimal.valueOf(100));