From f688d1656a6542f1756f62e2f10a11ff4489674a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 12 六月 2026 15:28:54 +0800
Subject: [PATCH] 修改社保工资计算
---
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index 51e8002..4badfb2 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -4,12 +4,13 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.staff.dto.CalculateSalaryDto;
+import com.ruoyi.staff.dto.StaffSalaryCalculateDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryMainService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.aspectj.weaver.loadtime.Aj;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,28 +24,34 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-03-06 01:22:05
*/
-@Api(tags = "鍛樺伐宸ヨ祫涓昏〃")
+@Tag(name = "鍛樺伐宸ヨ祫涓昏〃")
@RestController
@RequestMapping("/staffSalaryMain")
+@AllArgsConstructor
public class StaffSalaryMainController {
- @Autowired
private StaffSalaryMainService staffSalaryMainService;
@GetMapping("/listPage")
- @ApiOperation("鍛樺伐宸ヨ祫涓昏〃鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍛樺伐宸ヨ祫涓昏〃鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.listPage(page, staffSalaryMain);
}
- @ApiOperation("閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
+ @Operation(summary = "閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
@PostMapping("/calculateSalary")
- public AjaxResult calculateSalary(@RequestBody List<Long> ids) {
- return staffSalaryMainService.calculateSalary(ids);
+ public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
+ return staffSalaryMainService.calculateSalary(calculateSalaryDto);
+ }
+
+ @Operation(summary = "鎸夊憳宸ラ噸绠楀伐璧勬槑缁�")
+ @PostMapping("/calculateByEmployeeId")
+ public AjaxResult calculateByEmployeeId(@RequestBody StaffSalaryCalculateDto staffSalaryCalculateDto) {
+ return staffSalaryMainService.calculateSalaryByEmployee(staffSalaryCalculateDto);
}
@PostMapping("/add")
- @ApiOperation("鏂板缓宸ヨ祫琛�")
+ @Operation(summary = "鏂板缓宸ヨ祫琛�")
@Log(title = "鏂板缓宸ヨ祫琛�", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody StaffSalaryMain staffSalaryMain) {
@@ -52,7 +59,7 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼宸ヨ祫琛�")
+ @Operation(summary = "淇敼宸ヨ祫琛�")
@Log(title = "淇敼宸ヨ祫琛�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
@@ -60,7 +67,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎宸ヨ祫琛�")
+ @Operation(summary = "鍒犻櫎宸ヨ祫琛�")
@Log(title = "鍒犻櫎宸ヨ祫琛�", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids) {
--
Gitblit v1.9.3