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/procurementrecord/controller/ProcurementPriceManagementController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
index 4cfa06d..35ae216 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
@@ -3,11 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.pojo.ProcurementPriceManagement;
import com.ruoyi.procurementrecord.service.ProcurementPriceManagementService;
-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.transaction.annotation.Transactional;
@@ -20,7 +20,7 @@
* @date : 2025/9/17 15:08
*/
@RestController
-@Api(tags = "閲囪喘浠锋牸绠＄悊")
+@Tag(name = "閲囪喘浠锋牸绠＄悊")
@RequestMapping("/procurementPriceManagement")
@AllArgsConstructor
public class ProcurementPriceManagementController extends BaseController {
@@ -28,37 +28,37 @@
private ProcurementPriceManagementService procurementPriceManagementService;
@GetMapping("/listPage")
- @ApiOperation("閲囪喘浠锋牸绠＄悊-鏌ヨ")
- public AjaxResult listPage(Page page, ProcurementPriceManagement procurementPriceManagement){
+ @Operation(summary = "閲囪喘浠锋牸绠＄悊-鏌ヨ")
+ public R<?> listPage(Page page, ProcurementPriceManagement procurementPriceManagement){
IPage<ProcurementPriceManagement> result = procurementPriceManagementService.listPage(page, procurementPriceManagement);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/add")
- @ApiOperation("閲囪喘浠锋牸绠＄悊-娣诲姞")
+ @Operation(summary = "閲囪喘浠锋牸绠＄悊-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody ProcurementPriceManagement procurementPriceManagement){
+ public R<?> add(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.save(procurementPriceManagement);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@PostMapping("/update")
- @ApiOperation("閲囪喘浠锋牸绠＄悊-淇敼")
+ @Operation(summary = "閲囪喘浠锋牸绠＄悊-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody ProcurementPriceManagement procurementPriceManagement){
+ public R<?> update(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.updateById(procurementPriceManagement);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@DeleteMapping("/del")
- @ApiOperation("閲囪喘浠锋牸绠＄悊-鍒犻櫎")
+ @Operation(summary = "閲囪喘浠锋牸绠＄悊-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids){
+ public R<?> delete(@RequestBody List<Long> ids){
if (ids == null || ids.isEmpty()) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
boolean result = procurementPriceManagementService.removeByIds(ids);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
/**
--
Gitblit v1.9.3