Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-30 4bd9195ff5beeb416792b50bbaea84c56a1b500b

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TReassignServiceImpl.java

@@ -52,4 +52,14 @@
    public List<Map<String, Object>> getSmallPieceLogisticsList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getSmallPieceLogisticsList(page, roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }

    @Override
    public List<Map<String, Object>> getTransferOrderList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
        return this.baseMapper.getTransferOrderList(page, roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
    }

    @Override
    public List<Map<String, Object>> getCanSelectTransferDriverList(Page<Map<String, Object>> page, Integer companyId, Integer type, String name, String phone) {
        return this.baseMapper.getCanSelectTransferDriverList(page, companyId, type, name, phone);
    }
}