1站点没结账的按自然月处理

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

@@ -14,7 +14,7 @@ public class PayChangePeriodDto {
     @ApiModelProperty(value = "开户总数")
     private Integer customerNumber;
     @ApiModelProperty(value = "年")
-    private String year;
+    private Integer year;
     @ApiModelProperty(value = "月")
     private Integer month;
 }

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

@@ -74,6 +74,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
         PayChargeSurveyDto payChargeSurveyDto = new PayChargeSurveyDto();
         LoginUser loginUser = UserUtil.getCurrentUser();
         DecimalFormat df = new DecimalFormat("0.0");
+        BigDecimal defc = new BigDecimal("0.0");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//格式化为年月日
         BigInteger siteId = BigInteger.valueOf(loginUser.getSiteId());
         BigInteger customerId = BigInteger.valueOf(loginUser.getCustomerId());
@@ -83,6 +84,15 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             //获取当前账期
             List<BaseClosingAccountInfoDto> list = baseClosingAccountInfoMapper.getList(null,null,
                     siteId,customerId,null);
+            if(list.size() <=0){
+                BaseClosingAccountInfoDto a = new BaseClosingAccountInfoDto();
+                Calendar cal = Calendar.getInstance();
+                int year = cal.get(Calendar.YEAR);
+                int month = cal.get(Calendar.MONTH )+1;
+                a.setYear(year);
+                a.setMonth(month);
+                list.add(a);
+            }
             String startPeriod = list.get(0).getYear()+"-"+String.format("%02d", list.get(0).getMonth())+"-01";
             String endPeriod = list.get(0).getYear()+"-"+String.format("%02d", list.get(0).getMonth())+"-31";
 
@@ -121,8 +131,8 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
 
             //赋值客户总数跟上月比率
             payChargeSurveyDto.setLastAccountIsUp(lastAccountIsUp);
-            payChargeSurveyDto.setAccountNumber(sumAccount);
-            payChargeSurveyDto.setLastAccountRate(lastAccountRate);
+            payChargeSurveyDto.setAccountNumber(sumAccount != null ? sumAccount : 0);
+            payChargeSurveyDto.setLastAccountRate(lastAccountRate != null && lastAccountRate != "" ? lastAccountRate : "0.0");
 
 
             //水表总数计算
@@ -141,8 +151,8 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             lastMeterRate = lastMeterRate.contains("-") ? lastMeterRate.split("-")[1] : lastMeterRate;
             //赋值水表总数跟上月比率
             payChargeSurveyDto.setLastMeterIsUp(lastMeterIsUp);
-            payChargeSurveyDto.setMeterNumber(sumMeter);
-            payChargeSurveyDto.setLastMeterRate(lastMeterRate);
+            payChargeSurveyDto.setMeterNumber(sumMeter != null ? sumMeter : 0);
+            payChargeSurveyDto.setLastMeterRate(lastMeterRate != null && lastMeterRate != "" ? lastMeterRate : "0.0");
 
 
             //开户总数计算
@@ -160,8 +170,8 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             lastCusstomerRate = lastCusstomerRate.contains("-") ? lastCusstomerRate.split("-")[1] : lastCusstomerRate;
             //赋值开户总数跟上月比率
             payChargeSurveyDto.setLastCustomerIsUp(lastCustomerIsUp);
-            payChargeSurveyDto.setCustomerNumber(sumCustomer);
-            payChargeSurveyDto.setLastCustomerRate(lastCusstomerRate);
+            payChargeSurveyDto.setCustomerNumber(sumCustomer != null ? sumCustomer : 0);
+            payChargeSurveyDto.setLastCustomerRate(lastCusstomerRate != null && lastCusstomerRate != "" ? lastCusstomerRate : "0.0");
 
 
             //开户率
@@ -169,7 +179,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             num =(float)(sumCurrentCustomer/(sumCurrentMeter != null && sumCurrentMeter != 0 ? sumCurrentMeter : 1)*100);
             customerRate = df.format(num);
             customerRate = customerRate.contains("-") ? customerRate.split("-")[1] : customerRate;
-            payChargeSurveyDto.setCustomerRate(customerRate);
+            payChargeSurveyDto.setCustomerRate(customerRate != null && customerRate != "" ? customerRate : "0.0");
 
 
             //折线图统计，取最近一年
@@ -182,7 +192,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             List<PayChangePeriodDto> accoutList = payChargeSurveyMapper.getAccountList(startPeriod,latelyDate,siteId,customerId);
             PayChangePeriodDto periodDto = new PayChangePeriodDto();
             List<PayChangePeriodDto> accountList2 = new ArrayList<PayChangePeriodDto>();
-            periodDto.setYear(list.get(0).getYear()+"");
+            periodDto.setYear(list.get(0).getYear());
             periodDto.setMonth(list.get(0).getMonth());
             periodDto.setAccountNumber(sumCurrentAccount);
             periodDto.setCustomerNumber(sumCurrentCustomer);
@@ -206,7 +216,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
                     lastMonth = number;
                 }
                 PayChangePeriodDto info = new PayChangePeriodDto();
-                info.setYear(lastYear+"");
+                info.setYear(lastYear);
                 info.setMonth(lastMonth);
                 info.setMeterNumber(0);
                 info.setCustomerNumber(0);
@@ -237,6 +247,15 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
         try {
             List<BaseClosingAccountInfoDto> list = baseClosingAccountInfoMapper.getList(null,null,
                     siteId,customerId,null);
+            if(list.size() <=0){
+                BaseClosingAccountInfoDto a = new BaseClosingAccountInfoDto();
+                Calendar cal = Calendar.getInstance();
+                int year = cal.get(Calendar.YEAR);
+                int month = cal.get(Calendar.MONTH )+1;
+                a.setYear(year);
+                a.setMonth(month);
+                list.add(a);
+            }
             if(StringUtils.isBlank(periodDate)){
                 periodDate = list.get(0).getYear() + "-"+String.format("%02d",list.get(0).getMonth());
             }
@@ -285,18 +304,18 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
                 BigDecimal currentIncome = alipayIncome.add(wechatIncome).add(bankIncome).add(cashIncome);//当前账期收入总数
                 //查找上月收入
                 PayTransactionSurvey lastTran = payChargeSurveyMapper.getLastTranRocord(lastYear,lastMonth,siteId,customerId);
-                BigDecimal lastIncome = lastTran.getIncomeNumber();//上月总数
+                BigDecimal lastIncome = lastTran != null && lastTran.getIncomeNumber() != null ? lastTran.getIncomeNumber() : defc;//上月总数
                 PayTransactionSurvey payTransactionSurvey = new PayTransactionSurvey();
                 payTransactionSurvey.setIncomeNumber(currentIncome);
                 payTransactionSurvey.setLastIncomeNumber(lastIncome);
                 payTransactionSurvey.setCashIncome(cashIncome);
-                payTransactionSurvey.setLastCashIncome(lastTran.getCashIncome() != null ? lastTran.getCashIncome() : defc);
+                payTransactionSurvey.setLastCashIncome(lastTran != null && lastTran.getCashIncome() != null ? lastTran.getCashIncome() : defc);
                 payTransactionSurvey.setWechatIncome(wechatIncome);
-                payTransactionSurvey.setLastWechatIncome(lastTran.getWechatIncome() != null ? lastTran.getWechatIncome() : defc);
+                payTransactionSurvey.setLastWechatIncome(lastTran != null && lastTran.getWechatIncome() != null ? lastTran.getWechatIncome() : defc);
                 payTransactionSurvey.setAlipayIncome(alipayIncome);
-                payTransactionSurvey.setLastAlipayIncome(lastTran.getAlipayIncome() != null ? lastTran.getAlipayIncome() : defc);
+                payTransactionSurvey.setLastAlipayIncome(lastTran != null && lastTran.getAlipayIncome() != null ? lastTran.getAlipayIncome() : defc);
                 payTransactionSurvey.setBankIncome(bankIncome);
-                payTransactionSurvey.setLastBankIncome(lastTran.getBankIncome() != null ? lastTran.getBankIncome() : defc);
+                payTransactionSurvey.setLastBankIncome(lastTran != null && lastTran.getBankIncome() != null ? lastTran.getBankIncome() : defc);
                 payTransactionSurvey.setYear(year);
                 payTransactionSurvey.setMonth(month);
                 payTransactionSurveyDto = this.tranCompute(payTransactionSurvey);
@@ -449,6 +468,15 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
         try {
             List<BaseClosingAccountInfoDto> closinList = baseClosingAccountInfoMapper.getList(null,null,
                     siteId,customerId,null);
+            if(closinList.size() <=0){
+                BaseClosingAccountInfoDto a = new BaseClosingAccountInfoDto();
+                Calendar cal = Calendar.getInstance();
+                int year = cal.get(Calendar.YEAR);
+                int month = cal.get(Calendar.MONTH )+1;
+                a.setYear(year);
+                a.setMonth(month);
+                closinList.add(a);
+            }
             List<PayFeeSuevey> feeList = new ArrayList<PayFeeSuevey>();
             PayFeeSuevey feeSuevey = new PayFeeSuevey();
             //查找当前账期应收
@@ -526,6 +554,15 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
         try {
             List<BaseClosingAccountInfoDto> closinList = baseClosingAccountInfoMapper.getList(null,null,
                     siteId,customerId,null);
+            if(closinList.size() <=0){
+                BaseClosingAccountInfoDto a = new BaseClosingAccountInfoDto();
+                Calendar cal = Calendar.getInstance();
+                int year = cal.get(Calendar.YEAR);
+                int month = cal.get(Calendar.MONTH )+1;
+                a.setYear(year);
+                a.setMonth(month);
+                closinList.add(a);
+            }
             Integer year = closinList.get(0).getYear();
             Integer month = closinList.get(0).getMonth();
             //上一账期