1修改开户率较上月

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/PayChargeSurveyDto.java

@@ -32,6 +32,10 @@ public class PayChargeSurveyDto {
     //饼状图
     @ApiModelProperty(value = "开户率")
     private String customerRate;
+    @ApiModelProperty(value = "较上月开户率")
+    private String lastCMRate;
+    @ApiModelProperty(value = "开户较上月 0下降 1上升")
+    private Integer lastCMIsUp;
 
     //统计折线图
     @ApiModelProperty(value = "折线图-按月")

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayChargeSurveyServiceImpl.java

@@ -173,10 +173,35 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
 
             //开户率
             String customerRate = "0.0";
-            num =((float)sumCustomer/(sumMeter != null && sumMeter != 0 ? sumMeter : 1)*100);
-            customerRate = df.format(num);
+            float customernum =((float)sumCustomer/(sumMeter != null && sumMeter != 0 ? sumMeter : 1)*100);
+            customerRate = df.format(customernum);
             customerRate = customerRate.contains("-") ? customerRate.split("-")[1] : customerRate;
-            payChargeSurveyDto.setCustomerRate(customerRate != null && customerRate != "" ? customerRate : "0.0");
+
+            //较上月开户率
+            float lastcustomernum =((float)sumLastCustomer/(sumLastMeter != null && sumLastMeter != 0 ? sumLastMeter : 1)*100);
+            String lastCMRate = "-";
+            Integer lastCMIsUp = 0;
+            if(lastcustomernum >0){
+                if(customernum - lastcustomernum <=0){
+                    //本期减上期持平显示→
+                    lastCMIsUp = 2;
+                    lastCMRate = "→";
+                }else{
+                    num = customernum - lastcustomernum;
+                    lastCMRate = df.format(num);
+                    lastCMIsUp = num > 0  ? 1 : 0;
+                    //截取字符串
+                    lastCMRate = lastCMRate.contains("-") ? lastCMRate.split("-")[1] : lastCMRate;
+                }
+            }else{
+                //小于=0不计算增长率
+                //0下降  1上升 2不计算
+                lastCMIsUp = 2;
+                lastCMRate = "-";
+            }
+            payChargeSurveyDto.setCustomerRate(customerRate);
+            payChargeSurveyDto.setLastCMRate(lastCMRate != null && lastCMRate != "" ? lastCMRate : "0.0");
+            payChargeSurveyDto.setLastCMIsUp(lastCMIsUp);
 
 
             //折线图统计，取最近一年