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 reportProjects = reportProjectResourceService.query(reportProjectQueryParam); if (CollectionUtil.isNotEmpty(reportProjects)) { EchartsVo echartsVo = new EchartsVo();