ZengTao
2025-03-28 f68d3c71819feb59e7a227a5d992b059b900916c
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
@@ -121,5 +121,35 @@
        return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status", 0).eq("task_type", 2));
    }
    @Override
    public List<DownGlassTask> selectDownGlassTask(DownGlassTask downGlassTask, String startTime, String endTime){
        if (endTime != null && !endTime.isEmpty()) {
            endTime = endTime + " 23:59:59";
        }
        LambdaQueryWrapper<DownGlassTask> wrapper = new LambdaQueryWrapper<>();
        if (downGlassTask.getStartCell() != null) {
            wrapper.eq(DownGlassTask::getStartCell, downGlassTask.getStartCell());
        }
        if (downGlassTask.getEndCell() != 0) {
            wrapper.eq(DownGlassTask::getEndCell, downGlassTask.getEndCell());
        }
        if (downGlassTask.getTaskStatus() != -1) {
            wrapper.eq(DownGlassTask::getTaskStatus, downGlassTask.getTaskStatus());
        }
        if (downGlassTask.getTaskType() != -1) {
            wrapper.eq(DownGlassTask::getTaskType, downGlassTask.getTaskType());
        }
        if (startTime != null && !startTime.isEmpty()) {
            wrapper.ge(DownGlassTask::getCreateTime, startTime);
        }
        if (endTime != null && !endTime.isEmpty()) {
            wrapper.le(DownGlassTask::getCreateTime, endTime);
        }
        wrapper.orderByDesc(DownGlassTask::getCreateTime);
        wrapper.and(item -> item.eq(DownGlassTask::getDeleted, 0)
                .or()
                .eq(DownGlassTask::getDeleted, 1));
        wrapper.between(DownGlassTask::getCreateTime, startTime, endTime);
        return baseMapper.selectList(wrapper);
    }
}