From 2a703a8c30bb61121125ba4c966d50c8386fa9a8 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 5 Dec 2024 11:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/harmonic/controller/ExportModelController.java    | 3 +++
 1 file changed, 3 insertions(+)

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"));
         }