From bcf40504dd6dbad43d4d54a5c099abceb8de6d71 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 01 四月 2024 17:04:41 +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 | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 1a57ba5..f13a251 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
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
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;
@@ -81,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}")
@@ -99,9 +105,9 @@
return ApiResponse.success(unionApplyService.merge(saveUnionApplyDTO));
}
- @ApiOperation("鍏抽棴鍚堝苟鍗�")
- @PostMapping("/close")
- @RequiresPermissions("business:unionapply:close")
+ @ApiOperation("閫�鍥炲悎骞跺崟")
+ @PostMapping("/cancel")
+ @RequiresPermissions("business:unionapply:cancel")
public ApiResponse close(@RequestBody CloseDTO closeDTO) {
unionApplyService.cancelMerge(closeDTO);
return ApiResponse.success(null);
@@ -110,7 +116,7 @@
@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);
@@ -127,7 +133,7 @@
@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