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/ProcurementPlanController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
index f8d7b01..a110a5c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.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.ProcurementPlan;
import com.ruoyi.procurementrecord.service.ProcurementPlanService;
-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.web.bind.annotation.*;
@@ -19,7 +19,7 @@
* @date : 2025/9/18 16:13
*/
@RestController
-@Api(tags = "閲囪喘璁″垝")
+@Tag(name = "閲囪喘璁″垝")
@RequestMapping("/procurementPlan")
@AllArgsConstructor
public class ProcurementPlanController extends BaseController {
@@ -27,31 +27,31 @@
private ProcurementPlanService procurementPlanService;
@RequestMapping("/listPage")
- @ApiOperation("閲囪喘璁″垝-鏌ヨ")
- public AjaxResult listPage(Page page, ProcurementPlan procurementPlan){
+ @Operation(summary = "閲囪喘璁″垝-鏌ヨ")
+ public R<?> listPage(Page page, ProcurementPlan procurementPlan){
IPage<ProcurementPlan> result = procurementPlanService.listPage(page, procurementPlan);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/add")
- @ApiOperation("閲囪喘璁″垝-娣诲姞")
- public AjaxResult add(@RequestBody ProcurementPlan procurementPlan){
+ @Operation(summary = "閲囪喘璁″垝-娣诲姞")
+ public R<?> add(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.save(procurementPlan);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@PostMapping("/update")
- @ApiOperation("閲囪喘璁″垝-淇敼")
- public AjaxResult update(@RequestBody ProcurementPlan procurementPlan){
+ @Operation(summary = "閲囪喘璁″垝-淇敼")
+ public R<?> update(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.updateById(procurementPlan);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@DeleteMapping("/del")
- @ApiOperation("閲囪喘璁″垝-鍒犻櫎")
- public AjaxResult del(@RequestBody List<Long> ids){
+ @Operation(summary = "閲囪喘璁″垝-鍒犻櫎")
+ public R<?> del(@RequestBody List<Long> ids){
boolean result = procurementPlanService.removeByIds(ids);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
/**
--
Gitblit v1.9.3