From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/ApplyDetailService.java | 17 ++++++++++++++++-
1 files changed, 16 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 27cb0b8..2d83d49 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
@@ -2,13 +2,14 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.ApplyDetailPageDTO;
import com.doumee.dao.business.model.ApplyDetail;
import java.util.List;
/**
* 鎶曚繚鐢宠鏄庣粏淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
public interface ApplyDetailService {
@@ -87,6 +88,11 @@
*/
PageData<ApplyDetail> findPage(PageWrap<ApplyDetail> pageWrap);
+ PageData<ApplyDetail> findPageForCompany(PageWrap<ApplyDetailPageDTO> pageWrap);
+
+ List<ApplyDetail> findListForCompany(ApplyDetailPageDTO applyDetailPageDTO);
+
+
/**
* 鏉′欢缁熻
*
@@ -94,4 +100,13 @@
* @return long
*/
long count(ApplyDetail applyDetail);
+
+ /**
+ * 鏌ヨ鍛樺伐鎶曚繚璁板綍
+ * @param memberId
+ * @return
+ */
+ List<ApplyDetail> getMemberApplyList(Integer memberId);
+
+ List<ApplyDetail> getMemberSettleClaimsList(Integer memberId);
}
--
Gitblit v1.9.3