无关风月
2025-06-17 9e2da8d29be2a513ceab812d279534814dc545bb
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
@@ -1,7 +1,6 @@
package com.ruoyi.web.controller.api;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
@@ -9,11 +8,9 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.system.dto.LocationDTO;
import com.ruoyi.system.dto.LocationTypeDTO;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.LocationListQuery;
import com.ruoyi.system.query.LocationListTaskQuery;
import com.ruoyi.system.query.LocationTypeListQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.system.LocationListTaskVO;
import com.ruoyi.system.vo.system.LocationListVO;
@@ -50,7 +47,7 @@
    @Resource
    private TCleanerService cleanerService;
    @Resource
    private TTaskService tTaskService;
    private TTaskCleanService tTaskCleanService;
    @Resource
    private TTaskDetailService tTaskDetailService;
    @Resource
@@ -109,7 +106,7 @@
            }
        }
        PageInfo<LocationListTaskVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TTask> list = tTaskService.lambdaQuery()
        List<TTask> list = tTaskCleanService.lambdaQuery()
                .eq(TTask::getLocationId, query.getId())
                .between(StringUtils.hasLength(query.getStartTime()), TTask::getImplementTime, query.getStartTime(), query.getEndTime())
                .eq(query.getStatus() != null, TTask::getStatus, query.getStatus())