From ad45ebdf25cae54a3950bba33aa767fc7a8a43d8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 22 五月 2026 21:26:13 +0800
Subject: [PATCH] feat: 设备台账新增附件图片上传
---
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 15 +++++++--------
1 files changed, 7 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..569ca1c 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -3,8 +3,7 @@
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.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryMainService;
@@ -28,19 +27,19 @@
@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);
}
@@ -48,7 +47,7 @@
@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 +55,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 +63,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