forked from uav/ard-uav-server
parent: 36c5ec4b | patch | commit | ignore whitespace
zhaowenyu
2025-11-15 cbc27ebf59b58faad53dddf220927df3576fe8ab 
2025-11-15 zwy 任务列表筛选时间改为对beginTime筛选
1 files modified
4 ■■■■■ changed files
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java 4 ●●●●● patch | view | raw | blame | history 
 ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java


@@ -580,8 +580,8 @@


                new Page<WaylineJobEntity>(page, pageSize),


                new LambdaQueryWrapper<WaylineJobEntity>()


                        // 实际开始时间筛选，允许为空，为空则不进行筛选


                        .ge(startTime != null, WaylineJobEntity::getExecuteTime, startTime)


                        .le(endTime != null, WaylineJobEntity::getExecuteTime, endTime)


                        .ge(startTime != null, WaylineJobEntity::getBeginTime, startTime)


                        .le(endTime != null, WaylineJobEntity::getBeginTime, endTime)


                        // 任务类型筛选，允许为空，为空则不进行筛选


                        .eq(taskType != null, WaylineJobEntity::getTaskType, taskType)


                        // 任务名称筛选，允许为空，为空则不进行筛选;....模糊查询