|
@@ -633,11 +633,12 @@ public class BackgroundConvertDataServiceImpl extends ServiceImpl<BackgroundConv
|
|
|
} else if (startDateTime.equals(endDateTime)) {
|
|
|
// 开始时间等于结束时间
|
|
|
endDateTime = endDateTime.plusDays(1);
|
|
|
- } else if (ChronoUnit.DAYS.between(startDateTime, endDateTime) > 30) {
|
|
|
- // 开始时间和结束时间大于30天
|
|
|
- startDateTime = endDateTime.minus(30, ChronoUnit.DAYS);
|
|
|
- queryDTO.setStartDateTime(endDateTime.minus(30, ChronoUnit.DAYS));
|
|
|
}
|
|
|
+// else if (ChronoUnit.DAYS.between(startDateTime, endDateTime) > 30) {
|
|
|
+// // 开始时间和结束时间大于30天
|
|
|
+// startDateTime = endDateTime.minus(30, ChronoUnit.DAYS);
|
|
|
+// queryDTO.setStartDateTime(endDateTime.minus(30, ChronoUnit.DAYS));
|
|
|
+// }
|
|
|
queryWrapper.ge(BackgroundConvertData::getSyncTime, MyLocalDateUtil.timeZoneConversion(startDateTime, -queryDTO.getTimeZone()))
|
|
|
.le(BackgroundConvertData::getSyncTime, MyLocalDateUtil.timeZoneConversion(endDateTime, -queryDTO.getTimeZone()));
|
|
|
} else {
|