From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
index 5d4255d..b0d755d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
@@ -1,8 +1,14 @@
package com.ruoyi.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfFamily;
+import com.ruoyi.domain.ZfProperty;
+import com.ruoyi.domain.dto.UserInfoDto;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @Author Jinquan_Ou
@@ -13,10 +19,26 @@
@Service
public interface ZfFamilyService extends IService<ZfFamily> {
+ public AjaxResult selectDataList(ZfFamily zfFamily, Integer pageNum, Integer pageSize);
+ ZfFamily getByNameAndUser(ZfFamily zfFamily);
/**
* 鏍规嵁瀹跺涵鍚嶅瓧鏌ヨ瀹跺涵
*/
- ZfFamily getByName(String familyName);
+ ZfFamily getByName(String familyName, Integer clanId);
+ ZfFamily getByFid(Long fid);
+ ZfFamily getByFamId(Long fid);
+ List<UserInfoDto> getByFamilyId(Long fid);
+
+ List<UserInfoDto> getNowMember();
+
+ AjaxResult addMember(UserInfoDto userInfoDto);
+
+ AjaxResult removeMember(UserInfoDto userInfoDto);
+ AjaxResult addFamily(ZfFamily zfFamily);
+
+ AjaxResult updateFam(ZfFamily zfFamily);
+
+ AjaxResult deleteFam(Long []ids);
}
--
Gitblit v1.9.1