From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..96dc322 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -4,12 +4,12 @@
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.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 lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -26,9 +26,9 @@
@Api(tags = "鍛樺伐宸ヨ祫涓昏〃")
@RestController
@RequestMapping("/staffSalaryMain")
+@AllArgsConstructor
public class StaffSalaryMainController {
- @Autowired
private StaffSalaryMainService staffSalaryMainService;
@GetMapping("/listPage")
@@ -39,8 +39,8 @@
@ApiOperation("閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
@PostMapping("/calculateSalary")
- public AjaxResult calculateSalary(@RequestBody List<Long> ids) {
- return staffSalaryMainService.calculateSalary(ids);
+ public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
+ return staffSalaryMainService.calculateSalary(calculateSalaryDto);
}
@PostMapping("/add")
--
Gitblit v1.9.3