Merge remote-tracking branch 'origin/master'

fuliqi

2024-01-09 ebb1a448339bafc4c4849fdbc2291bd3a28261df

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -665,5 +665,24 @@
        map.put("dispositionInTime", onTimeDispose);
        map.put("register", register);
        return map;
    }

    @Override
    public IPage<WorkOrderVO> getWorkOrder(Integer pageIndex, Integer pageSize, String keyword) {
        if (pageIndex == null) {
            pageIndex = 1;
        }
        if (pageSize == null) {
            pageSize = 20;
        }
        IPage<WorkOrderVO> page = new Page<>(pageIndex, pageSize);
        return baseCaseMapper.getWorkOrder(page, keyword);
    }

    @Override
    public List<WorkOrderVO> getWorkOrderList(String keyword) {
        IPage<WorkOrderVO> page = new Page<>(1, 5000);
        IPage<WorkOrderVO> page1 = baseCaseMapper.getWorkOrder(page, keyword);
        return page1.getRecords();
    }
}