From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java b/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
index 03e03bb..a3b8b03 100644
--- a/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
@@ -6,9 +6,8 @@
import com.doumee.core.model.ApiResponse;
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 com.doumee.service.business.UnionApplyService;
import io.swagger.annotations.Api;
@@ -83,7 +82,12 @@
public void exportExcel (@RequestBody PageWrap<UnionApply> pageWrap, HttpServletResponse response) {
ExcelExporter.build(UnionApply.class).export(unionApplyService.findPage(pageWrap).getRecords(), "鍚堝苟鎶曚繚鍗曚俊鎭〃", response);
}
-
+ @ApiOperation("瀵煎嚭鎶曚繚璇︽儏鍗�")
+ @PostMapping("/exportDetailExcel")
+ @RequiresPermissions("business:unionapply:exportExcel")
+ public void exportDetailExcel (@RequestBody UnionApply model, HttpServletResponse response) {
+ ExcelExporter.build(UnionApply.class).exportUnionApplyDetail(unionApplyService.findDetailForExport(model), response);
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@@ -101,37 +105,38 @@
return ApiResponse.success(unionApplyService.merge(saveUnionApplyDTO));
}
- @ApiOperation("鍏抽棴鍚堝苟鍗�")
- @GetMapping("/close")
- @RequiresPermissions("business:unionapply:close")
- public ApiResponse close(@RequestParam Integer id) {
- unionApplyService.cancelMerge(id);
+ @ApiOperation("閫�鍥炲悎骞跺崟")
+ @PostMapping("/cancel")
+ @RequiresPermissions("business:unionapply:cancel")
+ public ApiResponse close(@RequestBody CloseDTO closeDTO) {
+ unionApplyService.cancelMerge(closeDTO);
return ApiResponse.success(null);
}
@PreventRepeat
@ApiOperation("涓婁紶鎶曚繚鍗�")
@PostMapping("/uploadToubaodan")
- @RequiresPermissions("business:unionapply:create")
+ @RequiresPermissions("business:unionapply:uploadToubaodan")
public ApiResponse uploadToubaodan(@RequestBody UploadMultifileDTO uploadMultifileDTO) {
unionApplyService.uploadToubaodan(uploadMultifileDTO);
return ApiResponse.success(null);
}
@ApiOperation("绛剧讲鐢宠鍗�")
- @GetMapping("/getSignLink")
+ @PostMapping("/getSignLink")
@RequiresPermissions("business:unionapply:query")
- public ApiResponse getSignLink(@RequestParam Integer id) {
- unionApplyService.getSignLink(id);
- return ApiResponse.success(null);
+ public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
+ return ApiResponse.success( unionApplyService.getSignLink(smsCheckDTO));
}
@ApiOperation("涓婁紶淇濋櫓鍗�")
@PostMapping("/uploadBXD")
- @RequiresPermissions("business:unionchange:query")
+ @RequiresPermissions("business:unionchange:uploadBXD")
public ApiResponse uploadBXD(@RequestBody UnionApplyBXDDTO unionApplyBXDDTO) {
unionApplyService.uploadBXD(unionApplyBXDDTO);
return ApiResponse.success(null);
}
+
+
}
--
Gitblit v1.9.3