feature 代码提交

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

@@ -47,7 +47,7 @@ public class MeterReadingRecordListener extends AnalysisEventListener<ImportMete
     // 时间异常的记录
     private List<ImportMeterReadingRecordVo> timeAnomalyList = new ArrayList<>();
 
-
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
     public MeterReadingRecordListener(SwUserManagementServiceImpl userManagementService, SwWaterUsageEntryServiceImpl waterUsageEntryService) {
         this.swUserManagementService = userManagementService;
         this.swWaterUsageEntryService = waterUsageEntryService;
@@ -84,7 +84,7 @@ public class MeterReadingRecordListener extends AnalysisEventListener<ImportMete
             duplicateRecordList.add(importMeterReadingRecordVo);
             return;
         }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+
         // 判断抄表日期和当前日期的关系
         if (sdf.format(importMeterReadingRecordVo.getReadingDate()).compareTo(sdf.format(nowDate)) > 0) {
             timeAnomalyList.add(importMeterReadingRecordVo);
@@ -124,14 +124,13 @@ public class MeterReadingRecordListener extends AnalysisEventListener<ImportMete
                     .eq(BaseDo::getDeleted, "0")
                     .in(SwUserManagementDo::getUsernumber, accountNumList)));
         });
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         // 校验导入的时间是否小于对应户号的最大抄表日期
         String errorStrDesc = recordList.parallelStream()
                 .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)) {