From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
index 492b923..ecde7dd 100644
--- a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
+++ b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
@@ -8,11 +8,11 @@
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.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+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.beans.factory.annotation.Autowired;
@@ -29,7 +29,7 @@
* @date : 2025/8/8 9:56
*/
@RestController
-@Api(tags = "钖叕缁╂晥")
+@Tag(name = "钖叕缁╂晥")
@RequestMapping("/compensationPerformance")
@AllArgsConstructor
public class CompensationPerformanceController extends BaseController {
@@ -39,38 +39,38 @@
@GetMapping("/listPage")
@Log(title = "钖叕缁╂晥-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("钖叕缁╂晥-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, String staffName, String payDateStr) {
+ @Operation(summary = "钖叕缁╂晥-鍒嗛〉鏌ヨ")
+ public R<?> listPage(Page page, String staffName, String payDateStr) {
IPage<CompensationPerformance> listPage = compensationPerformanceService.listPage(page, staffName, payDateStr);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Log(title = "钖叕缁╂晥-娣诲姞", businessType = BusinessType.INSERT)
- @ApiOperation("钖叕缁╂晥-娣诲姞")
+ @Operation(summary = "钖叕缁╂晥-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody CompensationPerformance compensationPerformance) {
+ public R<?> add(@RequestBody CompensationPerformance compensationPerformance) {
boolean save = compensationPerformanceService.save(compensationPerformance);
- return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+ return save ? R.ok(null, "娣诲姞鎴愬姛") : R.fail("娣诲姞澶辫触");
}
@PostMapping("/update")
@Log(title = "钖叕缁╂晥-淇敼", businessType = BusinessType.UPDATE)
- @ApiOperation("钖叕缁╂晥-淇敼")
+ @Operation(summary = "钖叕缁╂晥-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody CompensationPerformance compensationPerformance) {
+ public R<?> update(@RequestBody CompensationPerformance compensationPerformance) {
boolean update = compensationPerformanceService.updateById(compensationPerformance);
- return update ? AjaxResult.success("淇敼鎴愬姛") : AjaxResult.error("淇敼澶辫触");
+ return update ? R.ok(null, "淇敼鎴愬姛") : R.fail("淇敼澶辫触");
}
@DeleteMapping("/delete")
@Log(title = "钖叕缁╂晥-鍒犻櫎", businessType = BusinessType.DELETE)
- @ApiOperation("钖叕缁╂晥-鍒犻櫎")
+ @Operation(summary = "钖叕缁╂晥-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
boolean delete = compensationPerformanceService.removeBatchByIds(ids);
- return delete ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ return delete ? R.ok(null, "鍒犻櫎鎴愬姛") : R.fail("鍒犻櫎澶辫触");
}
@Log(title = "瀵煎嚭钖祫绠＄悊鍒楄〃", businessType = BusinessType.EXPORT)
@@ -91,7 +91,7 @@
@Log(title = "瀵煎叆钖祫绠＄悊鍒楄〃", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
- public AjaxResult importData(MultipartFile file) throws Exception {
+ public R<?> importData(MultipartFile file) throws Exception {
ExcelUtil<CompensationPerformance> util = new ExcelUtil<>(CompensationPerformance.class);
List<CompensationPerformance> list = util.importExcel(file.getInputStream());
list.forEach(item -> {
@@ -101,7 +101,7 @@
}
});
boolean b = compensationPerformanceService.saveBatch(list);
- return AjaxResult.success(b);
+ return R.ok(b);
}
--
Gitblit v1.9.3