From 2e1ac74716f62ca5712d0187cb7d7d25ee13efe5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/MemberService.java | 12 ++++++++++++
1 files changed, 12 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..536d665 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;
/**
@@ -87,6 +91,8 @@
*/
PageData<Member> findPage(PageWrap<Member> pageWrap);
+ PageData<Member> findPageForCompany(PageWrap<MemberQueryDTO> pageWrap);
+
/**
* 鏉′欢缁熻
*
@@ -94,4 +100,10 @@
* @return long
*/
long count(Member member);
+
+
+ List<Member> findListByDTO(MemberQueryDTO memberQueryDTO);
+
+ List<MemberImport> importBatch(MultipartFile file,Integer solutionId);
+
}
--
Gitblit v1.9.3