Browse Source

20240926-用量占比改为占比

thing_master
xiezw 1 year ago
parent
commit
b898c514e4
  1. 8
      modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyDosageUsageAndCostExcel.java
  2. 2
      modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyUsageAndCostExcel.java

8
modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyDosageUsageAndCostExcel.java

@ -152,9 +152,9 @@ public class PricePeakValleyDosageUsageAndCostExcel {
switch (attributeTypeEnum) { switch (attributeTypeEnum) {
case am: case am:
case hh: case hh:
return hh+"时"+"用量占比";
return hh+"时"+"占比";
case dd: case dd:
return dd+"日"+"用量占比";
return dd+"日"+"占比";
case week: case week:
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
if (Objects.equals(label, "item")) { if (Objects.equals(label, "item")) {
@ -169,7 +169,7 @@ public class PricePeakValleyDosageUsageAndCostExcel {
} }
return stringBuilder.toString(); return stringBuilder.toString();
case mm: case mm:
return month+"月"+"用量占比";
return month+"月"+"占比";
default: default:
} }
return null; return null;
@ -187,7 +187,7 @@ public class PricePeakValleyDosageUsageAndCostExcel {
} }
private String getTitle3(){ private String getTitle3(){
return "用量占比(%)";
return "占比(%)";
} }
private String getTitle(){ private String getTitle(){

2
modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyUsageAndCostExcel.java

@ -30,7 +30,7 @@ public class PricePeakValleyUsageAndCostExcel {
private String allDosage; private String allDosage;
@CustomExcel(name = "总价",orderNum=5) @CustomExcel(name = "总价",orderNum=5)
private String totalPrice; private String totalPrice;
@CustomExcel(name = "用量占比(%)",orderNum=6)
@CustomExcel(name = "占比(%)",orderNum=6)
private String realityRatio; private String realityRatio;
@CustomExcelCollection @CustomExcelCollection
private List<PricePeakValleyDosageUsageAndCostExcel> peakValleyDosageReqs; private List<PricePeakValleyDosageUsageAndCostExcel> peakValleyDosageReqs;

Loading…
Cancel
Save