提交代码
This commit is contained in:
parent
09b3fc959b
commit
416226331a
@ -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<TsTask> tsTasks = tsTaskService.list();
|
||||
LambdaQueryWrapper<TsTask> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.orderByDesc(TsTask::getTaskDate);
|
||||
List<TsTask> tsTasks = tsTaskService.list(queryWrapper);
|
||||
return ResponseResult.successData(tsTasks);
|
||||
}
|
||||
}
|
||||
|
@ -208,8 +208,9 @@ public class TsFilesServiceImpl extends ServiceImpl<TsFilesMapper, TsFiles> 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<TsFiles> tsFilesPage = tsFilesMapper.selectPage(page, queryWrapper);
|
||||
if (tsFilesPage == null) {
|
||||
|
@ -94,6 +94,7 @@ public class TsTaskServiceImpl extends ServiceImpl<TsTaskMapper, TsTask> impleme
|
||||
if (parseStartDate != null && parseEndDate != null) {
|
||||
queryWrapper.ge(TsTask::getTaskDate, parseStartDate).lt(TsTask::getTaskDate, parseEndDate);
|
||||
}
|
||||
queryWrapper.orderByDesc(TsTask::getTaskDate);
|
||||
//分页查询
|
||||
Page<TsTask> tsTaskPage = tsTaskMapper.selectPage(page, queryWrapper);
|
||||
return tsTaskPage;
|
||||
|
@ -85,7 +85,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
||||
queryWrapper.like(Project::getProjectName, projectName);
|
||||
}
|
||||
//根据创建时间排序
|
||||
queryWrapper.orderByAsc(Project::getCreateTime);
|
||||
queryWrapper.orderByDesc(Project::getCreateTime);
|
||||
//分页查询
|
||||
Page<Project> sdProjectPage = projectMapper.selectPage(page, queryWrapper);
|
||||
return sdProjectPage;
|
||||
|
Loading…
Reference in New Issue
Block a user