yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
徐杰盟 2024-01-26 09:20:28 +08:00
parent 1af695cbc4 0d10c5aa7d
commit 4bf90bd135
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -77,8 +77,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>15</source>
<target>15</target>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
</plugins>

4
src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java
View File

@ -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<BzServiceResource> page = serviceResourceDao.page(so.getPageSo().toPage(), query);

2
src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java
View File

@ -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;