|
|
|
@ -99,13 +99,16 @@ public class FileServiceImpl {
|
|
|
|
QueryWrapper queryWrapper = QueryWrapper.create()
|
|
|
|
QueryWrapper queryWrapper = QueryWrapper.create()
|
|
|
|
.from(FileStorageDO.class)
|
|
|
|
.from(FileStorageDO.class)
|
|
|
|
.eq(FileStorageDO.ID, que.getId(), ObjectUtil.isNotEmpty(que.getId()))
|
|
|
|
.eq(FileStorageDO.ID, que.getId(), ObjectUtil.isNotEmpty(que.getId()))
|
|
|
|
.like(FileStorageDO.FILE_NAME, que.getFileName(), ObjectUtil.isNotEmpty(que.getFileName()))
|
|
|
|
.like(FileStorageDO.FILE_NAME, que.getFileName(), ObjectUtil.isNotEmpty(que.getFileName()));
|
|
|
|
.between(
|
|
|
|
if (ObjectUtil.isNotEmpty(que.getStartTime()) && ObjectUtil.isNotEmpty(que.getEndTime())) {
|
|
|
|
|
|
|
|
queryWrapper.between(
|
|
|
|
FileStorageDO.ADD_TIME,
|
|
|
|
FileStorageDO.ADD_TIME,
|
|
|
|
que.getStartTime(), que.getEndTime(),
|
|
|
|
new Date(que.getStartTime()),
|
|
|
|
ObjectUtil.isNotEmpty(que.getStartTime()) && ObjectUtil.isNotEmpty(que.getEndTime())
|
|
|
|
new Date(que.getEndTime())
|
|
|
|
)
|
|
|
|
);
|
|
|
|
.orderBy(FileStorageDO.ADD_TIME, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
queryWrapper.orderBy(FileStorageDO.ADD_TIME, false);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Page<FileStorageDO> page = fileStorageService.pageAs(PageUtils.getPage(que), queryWrapper, FileStorageDO.class);// 调试sql
|
|
|
|
Page<FileStorageDO> page = fileStorageService.pageAs(PageUtils.getPage(que), queryWrapper, FileStorageDO.class);// 调试sql
|
|
|
|
if (ObjectUtil.isEmpty(page) || page.getRecords().isEmpty())
|
|
|
|
if (ObjectUtil.isEmpty(page) || page.getRecords().isEmpty())
|
|
|
|
|