From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java b/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java
index 940014c..9b59586 100644
--- a/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/SettleClaimsController.java
@@ -6,6 +6,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;
@@ -20,7 +21,7 @@
/**
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Api(tags = "鐞嗚禂鐢宠琛�")
@RestController
@@ -63,9 +64,26 @@
@PostMapping("/updateById")
@RequiresPermissions("business:settleclaims:update")
public ApiResponse updateById(@RequestBody SettleClaims settleClaims) {
- settleClaimsService.updateById(settleClaims);
+ settleClaimsService.updateForCompany(settleClaims);
return ApiResponse.success(null);
}
+
+ @ApiOperation("琛ュ厖璇存槑")
+ @PostMapping("/supplement")
+ @RequiresPermissions("business:settleclaims:update")
+ public ApiResponse supplement(@RequestBody SCSupplementDTO scSupplementDTO) {
+ settleClaimsService.supplement(scSupplementDTO);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("闄勪欢涓婁紶")
+ @PostMapping("/claimsUploadFile")
+ @RequiresPermissions("business:settleclaims:update")
+ public ApiResponse claimsUploadFile(@RequestBody SCSupplementDTO scSupplementDTO) {
+ settleClaimsService.claimsUploadFile(scSupplementDTO);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@@ -85,6 +103,6 @@
@GetMapping("/{id}")
@RequiresPermissions("business:settleclaims:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(settleClaimsService.findById(id));
+ return ApiResponse.success(settleClaimsService.getSettleClaimsDetail(id));
}
}
--
Gitblit v1.9.3