|
@@ -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);
|
|
|
|
|
|
|
|
|
//折线图统计,取最近一年
|