zhanghua
2025-07-16 c4c1c6cf89781eb06dc02b677a8954fdb2666c43
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -264,13 +264,15 @@
            baseCase.setViolationsVO(violationsVO);
        } else {
            IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
            LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
            dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
            DataDictionary dictionary = dataDictionaryMapper.selectOne(dict);
            if (dictionary != null) {
                illegalBuilding.setCategoryText(dictionary.getName());
            if (illegalBuilding != null) {
                LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
                dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
                DataDictionary dictionary = dataDictionaryMapper.selectOne(dict);
                if (dictionary != null) {
                    illegalBuilding.setCategoryText(dictionary.getName());
                }
                baseCase.setIllegalBuilding(illegalBuilding);
            }
            baseCase.setIllegalBuilding(illegalBuilding);
        }
        //获取调度信息
        Map mapD = new HashMap();
@@ -668,7 +670,7 @@
    }
    @Override
    public IPage<WorkOrderVO> getWorkOrder(Integer pageIndex, Integer pageSize, String keyword) {
    public IPage<WorkOrderVO> getWorkOrder(Integer pageIndex, Integer pageSize, String keyword, String startTime, String endTime) {
        if (pageIndex == null) {
            pageIndex = 1;
        }
@@ -676,13 +678,13 @@
            pageSize = 20;
        }
        IPage<WorkOrderVO> page = new Page<>(pageIndex, pageSize);
        return baseCaseMapper.getWorkOrder(page, keyword);
        return baseCaseMapper.getWorkOrder(page, keyword, startTime, endTime);
    }
    @Override
    public List<WorkOrderVO> getWorkOrderList(String keyword) {
    public List<WorkOrderVO> getWorkOrderList(String keyword, String startTime, String endTime) {
        IPage<WorkOrderVO> page = new Page<>(1, 5000);
        IPage<WorkOrderVO> page1 = baseCaseMapper.getWorkOrder(page, keyword);
        IPage<WorkOrderVO> page1 = baseCaseMapper.getWorkOrder(page, keyword, startTime, endTime);
        return page1.getRecords();
    }
}