From 8c2a413d2574151a2bc762aa0779f766de48160b Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期一, 16 十二月 2024 18:14:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java index d3796aa..8b81dc8 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java @@ -1,5 +1,7 @@ package com.ruoyi.other.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.other.api.domain.TechnicianSubscribe; import com.ruoyi.other.vo.TechnicianSubscribeVO; @@ -19,9 +21,9 @@ /** * 查询用于指定门店的相关预约记录 */ - List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long userId, Long shopId); + List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status); - List<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Long userId, Integer status); + IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Page<TechnicianSubscribe> page, Long userId, Integer status); - void subscribe(TechnicianSubscribe technicianSubscribe, Long technicianId); + void subscribe(TechnicianSubscribe technicianSubscribe); } -- Gitblit v1.7.1