feature 代码提交

zhsw-common/src/main/java/com/rongwei/zhsw/system/dao/SwUserManagementDao.java

@@ -31,6 +31,7 @@ public interface SwUserManagementDao extends BaseMapper<SwUserManagementDo> {
     void unbindAccount(@Param("dsKey") String dsKey,@Param("openId") String openId,@Param("userAccount") String userAccount);
 
     void setDefaultAccount1(@Param("dsKey") String dsKey,@Param("openId") String openId);
+
     void setDefaultAccount0(@Param("dsKey") String dsKey,@Param("openId") String openId,@Param("userAccount") String userAccount);
 }
 

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

@@ -84,8 +84,9 @@ public class MeterReadingRecordListener extends AnalysisEventListener<ImportMete
             duplicateRecordList.add(importMeterReadingRecordVo);
             return;
         }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         // 判断抄表日期和当前日期的关系
-        if (importMeterReadingRecordVo.getReadingDate().compareTo(nowDate) > 0) {
+        if (sdf.format(importMeterReadingRecordVo.getReadingDate()).compareTo(sdf.format(nowDate)) > 0) {
             timeAnomalyList.add(importMeterReadingRecordVo);
             return;
         }