diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java index 5a03ffc7c..62c63b9d9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java @@ -182,7 +182,10 @@ public class ExportModelController extends BaseController { param.setStartTime(DateUtil.format(startDate, "yyyy-MM-dd HH:mm:ss")); LocalDateTime parse = LocalDateTimeUtil.parse(DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss"), DatePattern.NORM_DATETIME_PATTERN); if(LocalDateTime.now().isBefore(parse)){ + param.setEndTime(LocalDateTimeUtil.format(LocalDateTime.now(),DatePattern.NORM_DATETIME_PATTERN)); + endDate = DateUtil.endOfDay(DateUtil.parse(LocalDateTimeUtil.format(LocalDateTime.now(),DatePattern.NORM_DATETIME_PATTERN))); + }else { param.setEndTime(DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss")); }