From 8b3c7885598f323b7fd86ba58f31a974a3d7b933 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 15 六月 2026 16:22:21 +0800
Subject: [PATCH] 导出工资明细
---
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 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..29fb3bb 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -4,12 +4,14 @@
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 jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,28 +25,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 = "閫氳繃鍛樺伐id閲嶇畻鍗曚釜鍛樺伐宸ヨ祫")
+ @PostMapping("/calculateByEmployeeId")
+ public AjaxResult calculateByEmployeeId(@RequestBody StaffSalaryCalculateDto calculateSalaryCalculateDto) {
+ return staffSalaryMainService.calculateSalaryByEmployee(calculateSalaryCalculateDto);
}
@PostMapping("/add")
- @ApiOperation("鏂板缓宸ヨ祫琛�")
+ @Operation(summary = "鏂板缓宸ヨ祫琛�")
@Log(title = "鏂板缓宸ヨ祫琛�", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody StaffSalaryMain staffSalaryMain) {
@@ -52,7 +60,7 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼宸ヨ祫琛�")
+ @Operation(summary = "淇敼宸ヨ祫琛�")
@Log(title = "淇敼宸ヨ祫琛�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
@@ -60,13 +68,17 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎宸ヨ祫琛�")
+ @Operation(summary = "鍒犻櫎宸ヨ祫琛�")
@Log(title = "鍒犻櫎宸ヨ祫琛�", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids) {
return staffSalaryMainService.delete(ids);
}
-
+ @PostMapping("/export")
+ @Operation(summary = "瀵煎嚭鍛樺伐钖祫鏄庣粏")
+ public void export(HttpServletResponse response, String salaryMonth) {
+ staffSalaryMainService.exportSalaryDetail(response, salaryMonth);
+ }
}
--
Gitblit v1.9.3