From f7a3d41075e00498f7033475108c0bcd86cda733 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 01 七月 2025 14:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java b/server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java
index f1cc91f..80ad474 100644
--- a/server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java
+++ b/server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java
@@ -86,7 +86,14 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<ApplyDetail>
*/
- PageData<ApplyDetail> findPage(PageWrap<ApplyDetailPageDTO> pageWrap);
+ PageData<ApplyDetail> findPage(PageWrap<ApplyDetail> pageWrap);
+
+ PageData<ApplyDetail> findPageForCompany(PageWrap<ApplyDetailPageDTO> pageWrap);
+
+ PageData<ApplyDetail> findPageForMini(PageWrap<ApplyDetailPageDTO> pageWrap);
+
+ List<ApplyDetail> findListForCompany(ApplyDetailPageDTO applyDetailPageDTO);
+
/**
* 鏉′欢缁熻
@@ -95,4 +102,13 @@
* @return long
*/
long count(ApplyDetail applyDetail);
+
+ /**
+ * 鏌ヨ鍛樺伐鎶曚繚璁板綍
+ * @param memberId
+ * @return
+ */
+ List<ApplyDetail> getMemberApplyList(Integer memberId);
+
+ List<ApplyDetail> getMemberSettleClaimsList(Integer memberId);
}
--
Gitblit v1.9.3