diff --git a/java/src/main/java/com/yfd/platform/modules/experimentalData/controller/TsTaskController.java b/java/src/main/java/com/yfd/platform/modules/experimentalData/controller/TsTaskController.java index 7677c95..20830b2 100644 --- a/java/src/main/java/com/yfd/platform/modules/experimentalData/controller/TsTaskController.java +++ b/java/src/main/java/com/yfd/platform/modules/experimentalData/controller/TsTaskController.java @@ -3,6 +3,7 @@ package com.yfd.platform.modules.experimentalData.controller; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; @@ -161,7 +162,9 @@ public class TsTaskController { @ResponseBody //@PreAuthorize("@el.check('select:devicesignal')") public ResponseResult listTsTask() { - List tsTasks = tsTaskService.list(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.orderByDesc(TsTask::getTaskDate); + List tsTasks = tsTaskService.list(queryWrapper); return ResponseResult.successData(tsTasks); } } diff --git a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsFilesServiceImpl.java b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsFilesServiceImpl.java index 5151436..e3a2a45 100644 --- a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsFilesServiceImpl.java +++ b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsFilesServiceImpl.java @@ -208,8 +208,9 @@ public class TsFilesServiceImpl extends ServiceImpl impl queryWrapper.isNotNull("work_path"); queryWrapper.ne("work_path", ""); //排序 - queryWrapper.orderByDesc("is_file");//时间 -// queryWrapper.orderByDesc("upload_time");//时间 + queryWrapper.orderByDesc("is_file"); + //时间 + queryWrapper.orderByDesc("upload_time"); //分页查询 Page tsFilesPage = tsFilesMapper.selectPage(page, queryWrapper); if (tsFilesPage == null) { diff --git a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsTaskServiceImpl.java b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsTaskServiceImpl.java index 59e77da..95b16de 100644 --- a/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsTaskServiceImpl.java +++ b/java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsTaskServiceImpl.java @@ -94,6 +94,7 @@ public class TsTaskServiceImpl extends ServiceImpl impleme if (parseStartDate != null && parseEndDate != null) { queryWrapper.ge(TsTask::getTaskDate, parseStartDate).lt(TsTask::getTaskDate, parseEndDate); } + queryWrapper.orderByDesc(TsTask::getTaskDate); //分页查询 Page tsTaskPage = tsTaskMapper.selectPage(page, queryWrapper); return tsTaskPage; diff --git a/java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/ProjectServiceImpl.java b/java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/ProjectServiceImpl.java index 7695d3c..e573d5b 100644 --- a/java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/ProjectServiceImpl.java +++ b/java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/ProjectServiceImpl.java @@ -85,7 +85,7 @@ public class ProjectServiceImpl extends ServiceImpl impl queryWrapper.like(Project::getProjectName, projectName); } //根据创建时间排序 - queryWrapper.orderByAsc(Project::getCreateTime); + queryWrapper.orderByDesc(Project::getCreateTime); //分页查询 Page sdProjectPage = projectMapper.selectPage(page, queryWrapper); return sdProjectPage;