From dc3cfa57c400ded43fdac3a73c7be27a18a90b23 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 15:57:47 +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 |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 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 b5346b2..6e36ad7 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,6 +2,9 @@
 
 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.model.UnionApply;
 import java.util.List;
 
@@ -94,4 +97,36 @@
      * @return long
      */
     long count(UnionApply unionApply);
+
+    /**
+     * 淇濆崟鍚堝苟
+     * @param saveUnionApplyDTO
+     */
+    Integer merge(SaveUnionApplyDTO saveUnionApplyDTO);
+
+    /**
+     * 鍙栨秷鍚堝苟鍗�
+     * @param id
+     */
+    void cancelMerge(Integer id);
+
+    /**
+     * 涓婁紶鎶曚繚鍗�
+     * @param uploadMultifileDTO
+     */
+    void uploadToubaodan(UploadMultifileDTO uploadMultifileDTO);
+
+    /**
+     * 鍚堝苟鍗� 淇濆崟绛剧讲
+     * @param id
+     * @return
+     */
+    String getSignLink(Integer id);
+
+    /**
+     * 涓婁紶淇濋櫓鍗�
+     * @param unionApplyBXDDTO
+     */
+    void uploadBXD(UnionApplyBXDDTO unionApplyBXDDTO);
+
 }

--
Gitblit v1.9.3