feature 用水量+1

zhsw-common/src/main/java/com/rongwei/zhsw/system/importListener/MeterReadingRecordListener.java

@@ -130,7 +130,7 @@ public class MeterReadingRecordListener extends AnalysisEventListener<ImportMete
                 .filter(record ->
                         allAccountData.parallelStream().anyMatch(userAccount -> userAccount.getUsernumber()
                                 .equals(record.getAccountNumber()) &&
-                                (userAccount.getLastmeterreaddate() != null && userAccount.getLastmeterreaddate().compareTo(record.getReadingDate()) > 0))
+                                (userAccount.getLastmeterreaddate() != null && userAccount.getLastmeterreaddate().compareTo(record.getReadingDate()) >= 0))
                 ).map(info -> info.getAccountNumber() + '-' + sdf.format(info.getReadingDate()))
                 .collect(Collectors.joining(" "));
         if (StringUtils.isNotBlank(errorStrDesc)) {

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/BillGenerationServiceImpl.java

@@ -222,7 +222,7 @@ public class BillGenerationServiceImpl {
             waterConsumption = thisreading.subtract(lastreading);
         } else {
             // 本次抄表数小于上次抄表数 用表具的最大值-上次抄表数+本次抄表数
-            waterConsumption = swUserManagementDo.getMetermaxvalue().subtract(lastreading).add(thisreading);
+            waterConsumption = swUserManagementDo.getMetermaxvalue().subtract(lastreading).add(thisreading).add(BigDecimal.ONE);
         }
         // 获取水价
         BigDecimal waterprice = swUserManagementDo.getWaterprice();