1修改首页默认值

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

@@ -128,9 +128,11 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
                 //按账期月卡旧数据
                 List<BaseClosingAccountInfoDto> list = baseClosingAccountInfoMapper.getListNumber(null,null,
                         BigInteger.valueOf(loginUser.getSiteId()),BigInteger.valueOf(loginUser.getCustomerId()),null);
-                for (int i=0; i<list.size(); i++){
-                    int state = list.get(i).getState();
-                    /*if(state == 1){*/
+                if(list.size() >0){
+                    //如果第一次使用系统则不创建记录
+                    for (int i=0; i<list.size(); i++){
+                        int state = list.get(i).getState();
+                        /*if(state == 1){*/
                         //把历史结账数据存进去，但不包含本期未结账的
                         this.insertAccountNumber(list.get(i).getYear(),list.get(i).getMonth(),list.get(i).getStartTime(),list.get(i).getEndTime());
                         //历史交易数据
@@ -139,7 +141,8 @@ public class BaseClosingAccountInfoServiceImpl implements BaseClosingAccountInfo
                         this.insertFeeSummary(list.get(i).getYear(),list.get(i).getMonth());
                         //历史水量
                         this.insetAmountInfo(list.get(i).getYear(),list.get(i).getMonth());
-                    /*}*/
+                        /*}*/
+                    }
                 }
             }else if(count > 0){
                 //存储本期未结账数据

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

@@ -90,12 +90,15 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
                     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);
+                for(int i=0; i<=1; i++){
+                    Calendar cal = Calendar.getInstance();
+                    int year = cal.get(Calendar.YEAR);
+                    int month = cal.get(Calendar.MONTH )+1;
+                    a.setYear(year);
+                    a.setMonth(month);
+                    a.setStartTime(new Date());
+                    list.add(a);
+                }
             }
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
             Date startTime = list.get(0).getStartTime();
@@ -106,12 +109,12 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
             String endPeriod = list.get(0).getYear()+"-"+String.format("%02d", list.get(0).getMonth())+"-31";
 
             //上一账期汇总
-            String lastDate = list.get(1).getYear()+"-"+String.format("%02d", list.get(1).getMonth())+"-01";
+            String lastDate = list.get(1).getYear() +"-"+String.format("%02d", list.get(1).getMonth())+"-01";
             PayAccountSurvey accountSurvey = payChargeSurveyMapper.getlastAccount(null,siteId,customerId);
 
             //客户总数计算
             //当前账期以内客户总数
-            Integer sumAccount = payChargeSurveyMapper.getAccountNumber(null,endPeriod,siteId,customerId);
+            Integer sumAccount = payChargeSurveyMapper.getAccountNumber(null,null,siteId,customerId);
             //当前账期客户总数
             Integer sumCurrentAccount = payChargeSurveyMapper.getAccountNumber(dateStart,dateEnd,siteId,customerId);
             //上一期客户数
@@ -131,7 +134,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
 
             //水表总数计算
             //当前账期以内的水表总数
-            Integer sumMeter = payChargeSurveyMapper.getMeterNumber(null,endPeriod,siteId,customerId);
+            Integer sumMeter = payChargeSurveyMapper.getMeterNumber(null,null,siteId,customerId);
             //当前账期水表数
             Integer sumCurrentMeter = payChargeSurveyMapper.getMeterNumber(dateStart,dateEnd,siteId,customerId);
             //上一期水表数
@@ -150,7 +153,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
 
 
             //开户总数计算
-            Integer sumCustomer = payChargeSurveyMapper.getCustomerNumber(null,endPeriod,siteId,customerId);
+            Integer sumCustomer = payChargeSurveyMapper.getCustomerNumber(null,null,siteId,customerId);
             //当前账期开户数
             Integer sumCurrentCustomer = payChargeSurveyMapper.getCustomerNumber(dateStart,dateEnd,siteId,customerId);
             //上一账期开户数
@@ -710,7 +713,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
      */
     public RecordInfo calculationRate(Integer currentAmount ,Integer lastAmount){
         RecordInfo info = new RecordInfo();
-        Integer lastIncomeIsUp = 0;
+        Integer lastIncomeIsUp = 2;
         String lastIncomeRate = "-";
         BigDecimal income = new BigDecimal("0.0");
         DecimalFormat df = new DecimalFormat("0.0");
@@ -751,7 +754,7 @@ public class PayChargeSurveyServiceImpl implements PayChargeSurveyService {
      */
     public RecordInfo calculationRate(BigDecimal currentIncome,BigDecimal lastIncome){
         RecordInfo info = new RecordInfo();
-        Integer lastIncomeIsUp = 0;
+        Integer lastIncomeIsUp = 2;
         String lastIncomeRate = "-";
         BigDecimal income = new BigDecimal("0.0");
         BigDecimal defc = new BigDecimal("0.0");