1修改

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

@@ -153,7 +153,7 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
             }
 
             // 更新本账期
-            /*String msg2 = year + "年" + String.format("%02d", month) + "月已经结账";
+            String msg2 = year + "年" + String.format("%02d", month) + "月已经结账";
             baseClosingAccountInfoDto.setEndTime(endTime);
             baseClosingAccountInfoDto.setRemarks(msg2);
             baseClosingAccountInfoDto.setState(1);
@@ -177,7 +177,7 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
                 baseClosingAccountInfoDto.setMonth(1);
             }
             baseClosingAccountInfoDto.setName(baseClosingAccountInfoDto.getYear()+"年"+String.format("%02d", baseClosingAccountInfoDto.getMonth())+"月");
-            this.add(baseClosingAccountInfoDto);*/
+            this.add(baseClosingAccountInfoDto);
         }else{
             message.setStatus(-707);
             message.setMsg(msg);

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

@@ -138,7 +138,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             Integer sumLastMeter = accountSurvey != null && accountSurvey.getMeterNumber() != null ? accountSurvey.getMeterNumber() :0;
             //水表总数较上月比率
             String lastMeterRate = "0.0";
-            info = this.calculationRate(sumCurrentMeter,sumLastMeter);
+            info = this.calculationRate(sumMeter,sumLastMeter);
             num =info.getCount();
             Integer lastMeterIsUp = info.getIsUp();
             //截取字符串
@@ -157,7 +157,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             Integer sumLastCustomer = accountSurvey != null && accountSurvey.getCustomerNumber() != null ? accountSurvey.getCustomerNumber() : 0;
             //水表总数较上月比率
             String lastCusstomerRate = "0.0";
-            info = this.calculationRate(sumCurrentCustomer,sumLastCustomer);
+            info = this.calculationRate(sumCustomer,sumLastCustomer);
             num =info.getCount();
             Integer lastCustomerIsUp = info.getIsUp();
             //截取字符串
@@ -724,7 +724,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
                 }else{
                     num =((float)(currentAmount - lastAmount)/(lastAmount != null && lastAmount != 0 ? lastAmount : 1)*100);
                     lastIncomeRate = df.format(num);
-                    Integer lastCustomerIsUp = num > 0  ? 1 : 0;
+                    lastIncomeIsUp = num > 0  ? 1 : 0;
                     //截取字符串
                     lastIncomeRate = lastIncomeRate.contains("-") ? lastIncomeRate.split("-")[1] : lastIncomeRate;
                 }