service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
@@ -350,6 +350,9 @@ } try{ if(assetImportLogDetailDto.getOutTime() == null) { assetImportLogDetailDto.setOutTime("2050-01-01 23:59:59"); } if(!(ListUtil.isNull(importRoomFees))){ if (DateUtil.getDateFromStringB(data.getString("chargeStart").split(" ")[0]).getTime() < DateUtil.getDateFromStringB(assetImportLogDetailDto.getTakeTime().split(" ")[0]).getTime() && !assetImportLogDetailDto.getState().equals("1100") && !assetImportLogDetailDto.getState().equals("1300")){ ImportRoomFee original = importRoomFees.get(0);