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 | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index dfc0d67..4badfb2 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+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.v3.oas.annotations.tags.Tag;
@@ -28,27 +28,33 @@
@RestController
@RequestMapping("/staffSalaryMain")
@AllArgsConstructor
-public class StaffSalaryMainController extends BaseController {
+public class StaffSalaryMainController {
private StaffSalaryMainService staffSalaryMainService;
@GetMapping("/listPage")
@Operation(summary = "鍛樺伐宸ヨ祫涓昏〃鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, StaffSalaryMain staffSalaryMain) {
+ public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.listPage(page, staffSalaryMain);
}
@Operation(summary = "閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
@PostMapping("/calculateSalary")
- public R<?> calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
+ 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")
@Operation(summary = "鏂板缓宸ヨ祫琛�")
@Log(title = "鏂板缓宸ヨ祫琛�", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody StaffSalaryMain staffSalaryMain) {
+ public AjaxResult add(@RequestBody StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.add(staffSalaryMain);
}
@@ -56,7 +62,7 @@
@Operation(summary = "淇敼宸ヨ祫琛�")
@Log(title = "淇敼宸ヨ祫琛�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public R<?> updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
+ public AjaxResult updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.updateStaffSalaryMain(staffSalaryMain);
}
@@ -64,7 +70,7 @@
@Operation(summary = "鍒犻櫎宸ヨ祫琛�")
@Log(title = "鍒犻櫎宸ヨ祫琛�", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
return staffSalaryMainService.delete(ids);
}
--
Gitblit v1.9.3