From 100018950d03efb3b7b2ae26dbd69c0bb2573c28 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 24 十二月 2024 15:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java
index 372bfbb..c32412a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.other.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.other.api.domain.TechnicianSubscribe;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
import org.apache.ibatis.annotations.Param;
@@ -22,6 +24,14 @@
* @param shopId
* @return
*/
- public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(@Param("userId") Long userId,
- @Param("shopId") Long shopId);
+ List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(
+ @Param("shopId") Long shopId,
+ @Param("status") Integer status);
+ List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(
+ @Param("shopId") Long shopId,
+ @Param("status") Integer status,@Param("phone")String phone,
+ @Param("name")String name,
+ @Param("serviceMode")Integer serviceMode);
+ IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(@Param("page") Page<TechnicianSubscribe> page, @Param("userId") Long userId,
+ @Param("status") Integer status);
}
--
Gitblit v1.7.1