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 8fba0440a..5a03ffc7c 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
@@ -1,8 +1,10 @@
 package com.njcn.harmonic.controller;
 
 
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
@@ -44,6 +46,7 @@ import sun.misc.BASE64Encoder;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -177,7 +180,12 @@ public class ExportModelController extends BaseController {
         ReportQueryParam param = new ReportQueryParam();
         param.setLineId(lineIndex);
         param.setStartTime(DateUtil.format(startDate, "yyyy-MM-dd HH:mm:ss"));
-        param.setEndTime(DateUtil.format(endDate, "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));
+        }else {
+            param.setEndTime(DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss"));
+        }
         param.setB(day == 0);
 
         //限值
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
index c177514bb..e519053e3 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
@@ -969,7 +969,7 @@ public class CustomReportServiceImpl implements CustomReportService {
                                         String localTime = InfluxDbSqlConstant.END_TIME;
                                         LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN);
                                         if(LocalDate.now().isEqual(localDate)){
-                                            localTime = LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER);
+                                            localTime =" "+ LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER);
                                         }
                                         son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
                                     } else {