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/company/src/main/java/com/doumee/api/business/UnionChangeController.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/UnionChangeController.java b/server/company/src/main/java/com/doumee/api/business/UnionChangeController.java
index 1f3017d..7098f83 100644
--- a/server/company/src/main/java/com/doumee/api/business/UnionChangeController.java
+++ b/server/company/src/main/java/com/doumee/api/business/UnionChangeController.java
@@ -6,6 +6,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.SaveUnionChangeDTO;
+import com.doumee.dao.business.dto.UnionChangeBXDDTO;
import com.doumee.dao.business.model.UnionChange;
import com.doumee.service.business.UnionChangeService;
import io.swagger.annotations.Api;
@@ -87,4 +89,41 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(unionChangeService.findById(id));
}
+
+ @PreventRepeat
+ @ApiOperation("鍒涘缓鍚堝苟鍗�")
+ @PostMapping("/merge")
+ @RequiresPermissions("business:unionchange:create")
+ public ApiResponse merge(@RequestBody SaveUnionChangeDTO saveUnionChangeDTO) {
+ return ApiResponse.success(unionChangeService.merge(saveUnionChangeDTO));
+ }
+
+
+ @ApiOperation("鍏抽棴鍚堝苟鍗�")
+ @GetMapping("/close")
+ @RequiresPermissions("business:unionchange:close")
+ public ApiResponse close(@RequestParam Integer id) {
+ unionChangeService.cancelMerge(id);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("绛剧讲鐢宠鍗�")
+ @GetMapping("/getSignLink")
+ @RequiresPermissions("business:unionchange:query")
+ public ApiResponse getSignLink(@RequestParam Integer id) {
+ unionChangeService.getSignLink(id);
+ return ApiResponse.success(null);
+ }
+
+
+
+ @ApiOperation("涓婁紶淇濋櫓鍗�")
+ @PostMapping("/uploadBXD")
+ @RequiresPermissions("business:unionchange:query")
+ public ApiResponse uploadBXD(@RequestBody UnionChangeBXDDTO unionChangeBXDDTO) {
+ unionChangeService.uploadBXD(unionChangeBXDDTO);
+ return ApiResponse.success(null);
+ }
+
}
--
Gitblit v1.9.3