From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index ad43b6c..569ca1c 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -7,10 +7,9 @@
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 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.*;
@@ -24,28 +23,28 @@
* @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 CalculateSalaryDto calculateSalaryDto) {
return staffSalaryMainService.calculateSalary(calculateSalaryDto);
}
@PostMapping("/add")
- @ApiOperation("鏂板缓宸ヨ祫琛�")
+ @Operation(summary = "鏂板缓宸ヨ祫琛�")
@Log(title = "鏂板缓宸ヨ祫琛�", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody StaffSalaryMain staffSalaryMain) {
@@ -53,7 +52,7 @@
}
@PostMapping("/update")
- @ApiOperation("淇敼宸ヨ祫琛�")
+ @Operation(summary = "淇敼宸ヨ祫琛�")
@Log(title = "淇敼宸ヨ祫琛�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
@@ -61,7 +60,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