From a01d637e9ff2bf26aa44c65a239413a38bd8b1fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 04 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/company/src/main/java/com/doumee/api/business/SettleRiskController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/SettleRiskController.java b/server/company/src/main/java/com/doumee/api/business/SettleRiskController.java
index 29fefa0..3e9ae03 100644
--- a/server/company/src/main/java/com/doumee/api/business/SettleRiskController.java
+++ b/server/company/src/main/java/com/doumee/api/business/SettleRiskController.java
@@ -3,14 +3,12 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
-import com.doumee.dao.business.dto.CompensationDTO;
-import com.doumee.dao.business.dto.OptSettleClaimsDTO;
-import com.doumee.dao.business.dto.SaveSupplementDescribeDTO;
-import com.doumee.dao.business.dto.SettleClaimsDTO;
+import com.doumee.dao.business.dto.*;
import com.doumee.service.business.SettleClaimsService;
import com.doumee.service.system.impl.SystemDictDataServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,9 +31,8 @@
@PreventRepeat
@ApiOperation("鐞嗚禂鎶ユ")
@PostMapping("/saveSettleClaims")
- public ApiResponse saveSettleClaims(@RequestBody SettleClaimsDTO settleClaimsDTO) {
- settleClaimsService.saveSettleClaims(settleClaimsDTO,systemDictDataService);
- return ApiResponse.success(null);
+ public ApiResponse<Integer> saveSettleClaims(@RequestBody SettleClaimsDTO settleClaimsDTO) {
+ return ApiResponse.success(settleClaimsService.saveSettleClaims(settleClaimsDTO,systemDictDataService));
}
@@ -66,6 +63,12 @@
return ApiResponse.success(null);
}
-
+ @PreventRepeat
+ @ApiOperation("淇敼鏀舵淇℃伅")
+ @PostMapping("/updReceiveInfo")
+ public ApiResponse updReceiveInfo(@RequestBody UpdReceiveInfoDTO dto) {
+ settleClaimsService.updReceiveInfo(dto);
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3