From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 19 五月 2025 09:45:38 +0800 Subject: [PATCH] Merge branch '2.0.2' into 2.0.1 --- server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java b/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java index 548de7a..59bdd8b 100644 --- a/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java +++ b/server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java @@ -8,6 +8,7 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; +import com.doumee.dao.business.dto.SCSupplementDTO; import com.doumee.dao.business.model.SettleClaims; import com.doumee.service.business.SettleClaimsService; import io.swagger.annotations.Api; @@ -63,6 +64,15 @@ public ApiResponse back(@RequestBody SettleClaims settleClaims) { return ApiResponse.success(settleClaimsService.back(settleClaims)); } + @ApiOperation("闄勪欢涓婁紶") + @PostMapping("/claimsUploadFile") + @RequiresPermissions("business:settleclaims:update") + public ApiResponse claimsUploadFile(@RequestBody SCSupplementDTO scSupplementDTO) { + settleClaimsService.claimsUploadFile(scSupplementDTO); + return ApiResponse.success(null); + } + + @ApiOperation("澶囨敞鏍囩") @PostMapping("/remark") @RequiresPermissions("business:settleclaims:remark") @@ -77,12 +87,12 @@ } @ApiOperation("璧勬枡涓嬭浇") @PostMapping("/exportFiles") - @RequiresPermissions("business:locks:exportExcel") - public void exportExcel(@RequestParam Integer id,HttpServletResponse response) { - if(id == null){ + @RequiresPermissions("business:settleclaims:exportExcel") + public void exportFiles(@RequestBody SettleClaims model,HttpServletResponse response) { + if(model.getId() == null){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } - settleClaimsService.exportFiles(id,response); + settleClaimsService.exportFiles(model.getId(),response); } @ApiOperation("鏍规嵁ID鍒犻櫎") @GetMapping("/delete/{id}") @@ -133,4 +143,10 @@ public ApiResponse<SettleClaims> findById(@PathVariable Integer id) { return ApiResponse.success(settleClaimsService.getSettleClaimsDetail(id)); } + @ApiOperation("鍒犻櫎闄勪欢") + @GetMapping("/delFile/{id}/{fileId}") + @RequiresPermissions("business:settleclaims:query") + public ApiResponse delFile(@PathVariable(name = "id") Integer id,@PathVariable(name = "fileId") Integer fileId) { + return ApiResponse.success(settleClaimsService.delFile(id,fileId)); + } } -- Gitblit v1.9.3