Browse Source

代码合并提交

thing_master
xiachao 1 year ago
parent
commit
607b2357c5
  1. 0
      help/sql/1ddl_1.0.0.sql
  2. 0
      help/sql/2dml_1.0.0.sql
  3. 0
      help/sql/3dml_1.0.1.sql
  4. 2
      modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java

0
help/sql/ddl_1.0.0.sql → help/sql/1ddl_1.0.0.sql

0
help/sql/dml_1.0.0.sql → help/sql/2dml_1.0.0.sql

0
help/sql/dml_1.0.1.sql → help/sql/3dml_1.0.1.sql

2
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(); PeakValleyPriceStatisticsInfo statisticsInfo = new PeakValleyPriceStatisticsInfo();
statisticsInfo.setAttrName("总用量");
statisticsInfo.setAttrName("总用"+result.getBaseName()+"量");
statisticsInfo.setBaseName(result.getBaseName()); statisticsInfo.setBaseName(result.getBaseName());
statisticsInfo.setAttrCode(result.getBaseCode()); statisticsInfo.setAttrCode(result.getBaseCode());
statisticsInfo.setAllDosageRatio(BigDecimal.valueOf(100)); statisticsInfo.setAllDosageRatio(BigDecimal.valueOf(100));

Loading…
Cancel
Save