From 7d89df50f836a586590577adb300382bae90384a Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Thu, 19 Mar 2026 10:50:20 +0800
Subject: [PATCH] =?UTF-8?q?fix--=E5=AE=A1=E8=AE=A1=E7=9B=91=E7=9D=A3?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=20=E5=AE=A1=E8=AE=A1=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=96=E5=8F=91=E6=96=87=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E3=80=81=E5=8E=BB=E9=99=A4=E5=BD=92=E6=A1=A3=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/pojo/param/ReportProjectQueryParam.java    | 7 +++++++
 .../reportproject/ReportProjectResourceService.java        | 4 ++++
 .../biutag/supervision/service/datav/DatavServiceImpl.java | 5 ++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/pojo/param/ReportProjectQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/ReportProjectQueryParam.java
index 8239471..be1f3fb 100644
--- a/src/main/java/com/biutag/supervision/pojo/param/ReportProjectQueryParam.java
+++ b/src/main/java/com/biutag/supervision/pojo/param/ReportProjectQueryParam.java
@@ -78,6 +78,13 @@ public class ReportProjectQueryParam implements Serializable {
     @Schema(description = "归档时间开始")
     private Date archivingEnd;
 
+    @Schema(description = "发文日期开始")
+    private Date publicationDateStart;
+
+
+    @Schema(description = "发文日期开始")
+    private Date publicationDateEnd;
+
     /**
      * @see com.biutag.supervision.constants.enums.invest.DeleteStatusEnum
      */
diff --git a/src/main/java/com/biutag/supervision/repository/reportproject/ReportProjectResourceService.java b/src/main/java/com/biutag/supervision/repository/reportproject/ReportProjectResourceService.java
index c9e17ac..e61ee66 100644
--- a/src/main/java/com/biutag/supervision/repository/reportproject/ReportProjectResourceService.java
+++ b/src/main/java/com/biutag/supervision/repository/reportproject/ReportProjectResourceService.java
@@ -47,6 +47,8 @@ public class ReportProjectResourceService {
         queryWrapper.le(param.getApplicantTimeEnd() != null, ReportProject::getApplicantTime, param.getApplicantTimeEnd());
         queryWrapper.ge(param.getArchivingStart() != null, ReportProject::getArchiving, param.getArchivingStart());
         queryWrapper.le(param.getArchivingEnd() != null, ReportProject::getArchiving, param.getArchivingEnd());
+        queryWrapper.ge(param.getPublicationDateStart() != null, ReportProject::getPublicationDate, param.getPublicationDateStart());
+        queryWrapper.le(param.getPublicationDateEnd() != null, ReportProject::getPublicationDate, param.getPublicationDateEnd());
         // 处理删除标志
         if (param.getDeleteFlag() != null) {
             queryWrapper.eq(ReportProject::getDeleteFlag, param.getDeleteFlag());
@@ -81,6 +83,8 @@ public class ReportProjectResourceService {
         queryWrapper.le(param.getApplicantTimeEnd() != null, ReportProject::getApplicantTime, param.getApplicantTimeEnd());
         queryWrapper.ge(param.getArchivingStart() != null, ReportProject::getArchiving, param.getArchivingStart());
         queryWrapper.le(param.getArchivingEnd() != null, ReportProject::getArchiving, param.getArchivingEnd());
+        queryWrapper.ge(param.getPublicationDateStart() != null, ReportProject::getPublicationDate, param.getPublicationDateStart());
+        queryWrapper.le(param.getPublicationDateEnd() != null, ReportProject::getPublicationDate, param.getPublicationDateEnd());
         if (queryWrapper.getExpression() == null || queryWrapper.getExpression().getSqlSegment().isEmpty()) {
             return 0L;
         }
diff --git a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
index 2f70377..1820644 100644
--- a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
+++ b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
@@ -514,9 +514,8 @@ public class DatavServiceImpl implements DatavService {
                 .map(entry -> new EchartsVo(entry.getKey(), entry.getValue().intValue()))
                 .collect(Collectors.toList());
         ReportProjectQueryParam reportProjectQueryParam = new ReportProjectQueryParam();
-        reportProjectQueryParam.setArchivingStart(request.getBeginTime());
-        reportProjectQueryParam.setArchivingEnd(request.getEndTime());
-        reportProjectQueryParam.setNode(ReportProjectNodeEnum.END.getCode());
+        reportProjectQueryParam.setPublicationDateStart(request.getBeginTime());
+        reportProjectQueryParam.setPublicationDateEnd(request.getEndTime());
         List<ReportProject> reportProjects = reportProjectResourceService.query(reportProjectQueryParam);
         if (CollectionUtil.isNotEmpty(reportProjects)) {
             EchartsVo echartsVo = new EchartsVo();