From 31a11bbd4312a0c34cc6556bf9971e5f64643e5a Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Thu, 5 Mar 2026 18:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A--=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/biutag/supervision/pojo/param/NegativeQueryParam.java   | 2 ++
 .../service/negativeReport/NegativeReportServiceImpl.java       | 2 ++
 .../supervision/service/report/ReportDataServiceImpl.java       | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java
index a6650d1..2ead5e6 100644
--- a/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java
+++ b/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java
@@ -1,6 +1,7 @@
 package com.biutag.supervision.pojo.param;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
@@ -26,6 +27,7 @@ public class NegativeQueryParam extends BasePage {
     private List<Date> discoveryTime = new ArrayList<>();
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<Date> crtTime = new ArrayList<>();
 
     private String responderKey;
diff --git a/src/main/java/com/biutag/supervision/service/negativeReport/NegativeReportServiceImpl.java b/src/main/java/com/biutag/supervision/service/negativeReport/NegativeReportServiceImpl.java
index e8581f2..5809329 100644
--- a/src/main/java/com/biutag/supervision/service/negativeReport/NegativeReportServiceImpl.java
+++ b/src/main/java/com/biutag/supervision/service/negativeReport/NegativeReportServiceImpl.java
@@ -33,6 +33,8 @@ public class NegativeReportServiceImpl implements NegativeReportService {
     private final ReportDataService reportDataService;
 
     public void generateReport(NegativeQueryParam request, HttpServletResponse response) {
+        request.setCurrent(1);
+        request.setSize(1000000);
         // 你要返回的模板路径
         String templatePath = "static/templates/督审一体化平台研判分析报告.docx";
         ClassPathResource resource = new ClassPathResource(templatePath);
diff --git a/src/main/java/com/biutag/supervision/service/report/ReportDataServiceImpl.java b/src/main/java/com/biutag/supervision/service/report/ReportDataServiceImpl.java
index b7c06a0..dc3e11b 100644
--- a/src/main/java/com/biutag/supervision/service/report/ReportDataServiceImpl.java
+++ b/src/main/java/com/biutag/supervision/service/report/ReportDataServiceImpl.java
@@ -38,7 +38,7 @@ public class ReportDataServiceImpl implements ReportDataService {
     @Override
     public ReportViewModel buildViewModel(NegativeQueryParam request) {
         String periodStart = TimeUtil.formatDate(request.getCrtTime().get(0));
-        String periodEnd = TimeUtil.formatDate(request.getCrtTime().get(0));
+        String periodEnd = TimeUtil.formatDate(request.getCrtTime().get(1));
         ReportViewModel vm = new ReportViewModel();
         vm.setPeriodStart(periodStart);
         vm.setPeriodEnd(periodEnd);