From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
index a110a5c..f156c94 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.procurementrecord.pojo.ProcurementPlan;
import com.ruoyi.procurementrecord.service.ProcurementPlanService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,36 +30,36 @@
@RequestMapping("/listPage")
@Operation(summary = "閲囪喘璁″垝-鏌ヨ")
- public R<?> listPage(Page page, ProcurementPlan procurementPlan){
+ public AjaxResult listPage(Page page, ProcurementPlan procurementPlan){
IPage<ProcurementPlan> result = procurementPlanService.listPage(page, procurementPlan);
- return R.ok(result);
+ return AjaxResult.success(result);
}
+ @Log(title = "鏂板閲囪喘璁″垝", businessType = BusinessType.INSERT)
@PostMapping("/add")
@Operation(summary = "閲囪喘璁″垝-娣诲姞")
- public R<?> add(@RequestBody ProcurementPlan procurementPlan){
+ public AjaxResult add(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.save(procurementPlan);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
+ @Log(title = "淇敼閲囪喘璁″垝", businessType = BusinessType.UPDATE)
@PostMapping("/update")
@Operation(summary = "閲囪喘璁″垝-淇敼")
- public R<?> update(@RequestBody ProcurementPlan procurementPlan){
+ public AjaxResult update(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.updateById(procurementPlan);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
+ @Log(title = "鍒犻櫎閲囪喘璁″垝", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
@Operation(summary = "閲囪喘璁″垝-鍒犻櫎")
- public R<?> del(@RequestBody List<Long> ids){
+ public AjaxResult del(@RequestBody List<Long> ids){
boolean result = procurementPlanService.removeByIds(ids);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
- /**
- * 瀵煎嚭
- * @param response
- */
+ @Log(title = "瀵煎嚭閲囪喘璁″垝", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response) {
procurementPlanService.export(response);
--
Gitblit v1.9.3