From b898c514e482ce49ab47064a5c290bb9a79e45f2 Mon Sep 17 00:00:00 2001
From: xiezw <Sddt8888!>
Date: Thu, 26 Sep 2024 17:06:09 +0800
Subject: [PATCH] =?UTF-8?q?20240926-=E7=94=A8=E9=87=8F=E5=8D=A0=E6=AF=94?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8D=A0=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/PricePeakValleyDosageUsageAndCostExcel.java     | 8 ++++----
 .../excel/PricePeakValleyUsageAndCostExcel.java           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyDosageUsageAndCostExcel.java b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyDosageUsageAndCostExcel.java
index 8ff0d27..79a7f94 100644
--- a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyDosageUsageAndCostExcel.java
+++ b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyDosageUsageAndCostExcel.java
@@ -152,9 +152,9 @@ public class PricePeakValleyDosageUsageAndCostExcel {
         switch (attributeTypeEnum) {
             case am:
             case hh:
-                return hh+"时"+"用量占比";
+                return hh+"时"+"占比";
             case dd:
-                return dd+"日"+"用量占比";
+                return dd+"日"+"占比";
             case week:
                 StringBuilder stringBuilder = new StringBuilder();
                 if (Objects.equals(label, "item")) {
@@ -169,7 +169,7 @@ public class PricePeakValleyDosageUsageAndCostExcel {
                 }
                 return stringBuilder.toString();
             case mm:
-                return month+"月"+"用量占比";
+                return month+"月"+"占比";
             default:
         }
         return null;
@@ -187,7 +187,7 @@ public class PricePeakValleyDosageUsageAndCostExcel {
     }
     private String getTitle3(){
 
-        return "用量占比(%)";
+        return "占比(%)";
 
     }
     private String getTitle(){
diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyUsageAndCostExcel.java b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyUsageAndCostExcel.java
index 3a1fda6..e143870 100644
--- a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyUsageAndCostExcel.java
+++ b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/excel/PricePeakValleyUsageAndCostExcel.java
@@ -30,7 +30,7 @@ public class PricePeakValleyUsageAndCostExcel {
     private String allDosage;
     @CustomExcel(name = "总价",orderNum=5)
     private String totalPrice;
-    @CustomExcel(name = "用量占比(%)",orderNum=6)
+    @CustomExcel(name = "占比(%)",orderNum=6)
     private String realityRatio;
     @CustomExcelCollection
     private List<PricePeakValleyDosageUsageAndCostExcel> peakValleyDosageReqs;