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/UnionChangeService.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/UnionChangeService.java b/server/service/src/main/java/com/doumee/service/business/UnionChangeService.java
index 0e724e7..d626d1f 100644
--- a/server/service/src/main/java/com/doumee/service/business/UnionChangeService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UnionChangeService.java
@@ -2,6 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.SaveUnionChangeDTO;
+import com.doumee.dao.business.dto.UnionChangeBXDDTO;
import com.doumee.dao.business.model.UnionChange;
import java.util.List;
@@ -94,4 +96,34 @@
* @return long
*/
long count(UnionChange unionChange);
+
+ /**
+ * 鍒涘缓鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶鍗曪級
+ * @param saveUnionChangeDTO
+ * @return
+ */
+ Integer merge(SaveUnionChangeDTO saveUnionChangeDTO);
+
+ /**
+ * 鍏抽棴 鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶鍗曪級
+ * @param id
+ */
+ void cancelMerge(Integer id);
+
+
+ /**
+ * 鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶锛� - 鎶曚繚鐢宠绛剧讲
+ * @param id
+ * @return
+ */
+ String getSignLink(Integer id);
+
+
+ /**
+ * 鍚堝苟鍗� 涓婁紶淇濋櫓鍗�
+ * @param unionChangeBXDDTO
+ */
+ void uploadBXD(UnionChangeBXDDTO unionChangeBXDDTO);
+
+
}
--
Gitblit v1.9.3