代码调整

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java

@@ -91,10 +91,10 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer tAccrued;
     private Float oAverage;
     private Float oAccrued;
-    private Integer chainAverage;
-    private Integer chainAccrued;
-    private Integer sameAverage;
-    private Integer sameAccrued;
+    private Float chainAverage;
+    private Float chainAccrued;
+    private Float sameAverage;
+    private Float sameAccrued;
     private Float averageOverDay;
 
     /**
@@ -104,10 +104,10 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer tAccrued1;
     private Float oAverage1;
     private Float oAccrued1;
-    private Integer chainAverage1;
-    private Integer chainAccrued1;
-    private Integer sameAverage1;
-    private Integer sameAccrued1;
+    private Float chainAverage1;
+    private Float chainAccrued1;
+    private Float sameAverage1;
+    private Float sameAccrued1;
     private Float averageOverDay1;
 
     /**
@@ -117,10 +117,10 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer tAccrued2;
     private Float oAverage2;
     private Float oAccrued2;
-    private Integer chainAverage2;
-    private Integer chainAccrued2;
-    private Integer sameAverage2;
-    private Integer sameAccrued2;
+    private Float chainAverage2;
+    private Float chainAccrued2;
+    private Float sameAverage2;
+    private Float sameAccrued2;
     private Float averageOverDay2;
 
     /**
@@ -130,10 +130,10 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer tAccrued3;
     private Float oAverage3;
     private Float oAccrued3;
-    private Integer chainAverage3;
-    private Integer chainAccrued3;
-    private Integer sameAverage3;
-    private Integer sameAccrued3;
+    private Float chainAverage3;
+    private Float chainAccrued3;
+    private Float sameAverage3;
+    private Float sameAccrued3;
     private Float averageOverDay3;
 
     /**
@@ -143,10 +143,10 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer tAccrued4;
     private Float oAverage4;
     private Float oAccrued4;
-    private Integer chainAverage4;
-    private Integer chainAccrued4;
-    private Integer sameAverage4;
-    private Integer sameAccrued4;
+    private Float chainAverage4;
+    private Float chainAccrued4;
+    private Float sameAverage4;
+    private Float sameAccrued4;
     private Float averageOverDay4;
 
 
@@ -157,10 +157,10 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer tAccrued5;
     private Float oAverage5;
     private Float oAccrued5;
-    private Integer chainAverage5;
-    private Integer chainAccrued5;
-    private Integer sameAverage5;
-    private Integer sameAccrued5;
+    private Float chainAverage5;
+    private Float chainAccrued5;
+    private Float sameAverage5;
+    private Float sameAccrued5;
     private Float averageOverDay5;
 
 
@@ -171,10 +171,10 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer tAccrued6;
     private Float oAverage6;
     private Float oAccrued6;
-    private Integer chainAverage6;
-    private Integer chainAccrued6;
-    private Integer sameAverage6;
-    private Integer sameAccrued6;
+    private Float chainAverage6;
+    private Float chainAccrued6;
+    private Float sameAverage6;
+    private Float sameAccrued6;
     private Float averageOverDay6;
 
     /**
@@ -184,10 +184,10 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer tAccrued7;
     private Float oAverage7;
     private Float oAccrued7;
-    private Integer chainAverage7;
-    private Integer chainAccrued7;
-    private Integer sameAverage7;
-    private Integer sameAccrued7;
+    private Float chainAverage7;
+    private Float chainAccrued7;
+    private Float sameAverage7;
+    private Float sameAccrued7;
     private Float averageOverDay7;
 
     /**
@@ -197,10 +197,10 @@ public class RStatSubstationOrg2VO implements Serializable {
     private Integer tAccrued8;
     private Float oAverage8;
     private Float oAccrued8;
-    private Integer chainAverage8;
-    private Integer chainAccrued8;
-    private Integer sameAverage8;
-    private Integer sameAccrued8;
+    private Float chainAverage8;
+    private Float chainAccrued8;
+    private Float sameAverage8;
+    private Float sameAccrued8;
     private Float averageOverDay8;
 
     @Data

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java

@@ -116,16 +116,13 @@ public class RStatSubstationOrgVO implements Serializable {
     private Float overLimitMeasurementRatioAccrued;
 
     //同比日均
-    private Integer chainAverage;
+    private Float chainAverage;
     //同比累计
-    private Integer chainAccrued;
-
+    private Float chainAccrued;
     //环比日均
-    private Integer sameAverage;
+    private Float sameAverage;
     //环比累计
-    private Integer sameAccrued;
-
-
+    private Float sameAccrued;
     //平均天数
     private Float   averageOverDay;