From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/platform/src/main/java/com/doumee/api/business/SettleClaimsController.java | 68 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 3 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 0e75574..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
@@ -3,9 +3,12 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
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;
@@ -20,7 +23,7 @@
/**
* @author 姹熻箘韫�
- * @date 2024/01/15 11:15
+ * @date 2024/01/16 10:03
*/
@Api(tags = "鐞嗚禂鐢宠琛�")
@RestController
@@ -37,7 +40,60 @@
public ApiResponse create(@RequestBody SettleClaims settleClaims) {
return ApiResponse.success(settleClaimsService.create(settleClaims));
}
+ @ApiOperation("娣诲姞鎶ユ鍙�")
+ @PostMapping("/addCode")
+ @RequiresPermissions("business:settleclaims:addCode")
+ public ApiResponse addCode(@RequestBody SettleClaims settleClaims) {
+ return ApiResponse.success(settleClaimsService.addCode(settleClaims));
+ }
+ @ApiOperation("鐞嗚禂澶勭悊")
+ @PostMapping("/dealBiz")
+ @RequiresPermissions("business:settleclaims:dealBiz")
+ public ApiResponse dealBiz(@RequestBody SettleClaims settleClaims) {
+ return ApiResponse.success(settleClaimsService.dealBiz(settleClaims));
+ }
+ @ApiOperation("缁撴鎻愪氦")
+ @PostMapping("/doneCommit")
+ @RequiresPermissions("business:settleclaims:doneCommit")
+ public ApiResponse doneCommit(@RequestBody SettleClaims settleClaims) {
+ return ApiResponse.success(settleClaimsService.doneCommit(settleClaims));
+ }
+ @ApiOperation("鎾ら攢鐢宠")
+ @PostMapping("/back")
+ @RequiresPermissions("business:settleclaims:back")
+ 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")
+ public ApiResponse remark(@RequestBody SettleClaims settleClaims) {
+ return ApiResponse.success(settleClaimsService.remark(settleClaims));
+ }
+ @ApiOperation("璧勬枡纭")
+ @PostMapping("/confirm")
+ @RequiresPermissions("business:settleclaims:confirm")
+ public ApiResponse confirm(@RequestBody SettleClaims settleClaims) {
+ return ApiResponse.success(settleClaimsService.confirm(settleClaims));
+ }
+ @ApiOperation("璧勬枡涓嬭浇")
+ @PostMapping("/exportFiles")
+ @RequiresPermissions("business:settleclaims:exportExcel")
+ public void exportFiles(@RequestBody SettleClaims model,HttpServletResponse response) {
+ if(model.getId() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ settleClaimsService.exportFiles(model.getId(),response);
+ }
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@RequiresPermissions("business:settleclaims:delete")
@@ -84,7 +140,13 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:settleclaims:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(settleClaimsService.findById(id));
+ 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