diff --git a/pom.xml b/pom.xml index c6ab331..997596f 100644 --- a/pom.xml +++ b/pom.xml @@ -77,8 +77,8 @@ org.apache.maven.plugins maven-compiler-plugin - 15 - 15 + 21 + 21 diff --git a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java index 58074a9..131551b 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java @@ -83,8 +83,8 @@ public class BzServiceResourceController { query.like(BzServiceResource::getName, so.getName()); } - query.le(BzServiceResource::getRegisterDate, so.getTimeSo().getEnd()); - query.ge(BzServiceResource::getRegisterDate, so.getTimeSo().getStart()); + query.le(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getEnd()); + query.ge(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getStart()); query.orderByDesc(BzServiceResource::getRegisterDate); Page page = serviceResourceDao.page(so.getPageSo().toPage(), query); diff --git a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java index ba2e239..410f9a9 100644 --- a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java +++ b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java @@ -23,7 +23,7 @@ public class BzServiceResourceSo { private PageSo pageSo; @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class}) - private DateTimeRangeSo timeSo; + private DateTimeRangeSo dateTimeRangeSo; @Schema(description = "服务名称") private String name;