From 9b138d5216ad21a69d0dfde310ccc81e53fb627e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 09 四月 2024 15:38:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/MemberService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/MemberService.java b/server/service/src/main/java/com/doumee/service/business/MemberService.java
index d4b8cee..14012d5 100644
--- a/server/service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -2,7 +2,11 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.MemberImport;
+import com.doumee.dao.business.dto.MemberQueryDTO;
import com.doumee.dao.business.model.Member;
+import org.springframework.web.multipart.MultipartFile;
+
import java.util.List;
/**
@@ -63,6 +67,8 @@
*/
Member findById(Integer id);
+ Member findDetailById(Integer id);
+
/**
* 鏉′欢鏌ヨ鍗曟潯璁板綍
*
@@ -87,6 +93,8 @@
*/
PageData<Member> findPage(PageWrap<Member> pageWrap);
+ PageData<Member> findPageForCompany(PageWrap<MemberQueryDTO> pageWrap);
+
/**
* 鏉′欢缁熻
*
@@ -94,4 +102,10 @@
* @return long
*/
long count(Member member);
+
+
+ List<Member> findListByDTO(MemberQueryDTO memberQueryDTO);
+
+ List<MemberImport> importBatch(MultipartFile file,Integer solutionId);
+
}
--
Gitblit v1.9.3