From 9748f3f74f9f5d49d23528e9005bd82577591992 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 10 四月 2024 18:24:49 +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 | 9 +++++++++
1 files changed, 9 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 f553fd8..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,8 +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;
/**
@@ -64,6 +67,8 @@
*/
Member findById(Integer id);
+ Member findDetailById(Integer id);
+
/**
* 鏉′欢鏌ヨ鍗曟潯璁板綍
*
@@ -88,6 +93,8 @@
*/
PageData<Member> findPage(PageWrap<Member> pageWrap);
+ PageData<Member> findPageForCompany(PageWrap<MemberQueryDTO> pageWrap);
+
/**
* 鏉′欢缁熻
*
@@ -99,4 +106,6 @@
List<Member> findListByDTO(MemberQueryDTO memberQueryDTO);
+ List<MemberImport> importBatch(MultipartFile file,Integer solutionId);
+
}
--
Gitblit v1.9.3