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/UnionApplyService.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java b/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java
index d62db04..26809f7 100644
--- a/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UnionApplyService.java
@@ -2,9 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.dto.SaveUnionApplyDTO;
-import com.doumee.dao.business.dto.UnionApplyBXDDTO;
-import com.doumee.dao.business.dto.UploadMultifileDTO;
+import com.doumee.dao.business.dto.*;
+import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.dao.business.model.UnionApply;
import java.util.List;
@@ -102,13 +101,13 @@
* 淇濆崟鍚堝苟
* @param saveUnionApplyDTO
*/
- void merge(SaveUnionApplyDTO saveUnionApplyDTO);
+ Integer merge(SaveUnionApplyDTO saveUnionApplyDTO);
/**
* 鍙栨秷鍚堝苟鍗�
- * @param id
+ * @param closeDTO
*/
- void cancelMerge(Integer id);
+ void cancelMerge(CloseDTO closeDTO);
/**
* 涓婁紶鎶曚繚鍗�
@@ -118,10 +117,10 @@
/**
* 鍚堝苟鍗� 淇濆崟绛剧讲
- * @param id
+ * @param smsCheckDTO
* @return
*/
- String getSignLink(Integer id);
+ String getSignLink(SmsCheckDTO smsCheckDTO);
/**
* 涓婁紶淇濋櫓鍗�
@@ -129,4 +128,13 @@
*/
void uploadBXD(UnionApplyBXDDTO unionApplyBXDDTO);
+ UnionApply detail(Integer applyId);
+
+ UnionApply findDetailForExport(UnionApply model);
+
+ /**
+ * 鏇存柊鍚堝苟鍗曢噾棰�
+ * @param id
+ */
+ void updateUnionApplyCurrentFee(Integer id);
}
--
Gitblit v1.9.3