From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
index 35ae216..cc9f74c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.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.ProcurementPriceManagement;
import com.ruoyi.procurementrecord.service.ProcurementPriceManagementService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,42 +31,42 @@
@GetMapping("/listPage")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-鏌ヨ")
- public R<?> listPage(Page page, ProcurementPriceManagement procurementPriceManagement){
+ public AjaxResult listPage(Page page, ProcurementPriceManagement procurementPriceManagement){
IPage<ProcurementPriceManagement> result = procurementPriceManagementService.listPage(page, procurementPriceManagement);
- return R.ok(result);
+ return AjaxResult.success(result);
}
+ @Log(title = "鏂板閲囪喘浠锋牸绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/add")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public R<?> add(@RequestBody ProcurementPriceManagement procurementPriceManagement){
+ public AjaxResult add(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.save(procurementPriceManagement);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
+ @Log(title = "淇敼閲囪喘浠锋牸绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/update")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-淇敼")
@Transactional(rollbackFor = Exception.class)
- public R<?> update(@RequestBody ProcurementPriceManagement procurementPriceManagement){
+ public AjaxResult update(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.updateById(procurementPriceManagement);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
+ @Log(title = "鍒犻櫎閲囪喘浠锋牸绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public R<?> delete(@RequestBody List<Long> ids){
+ public AjaxResult delete(@RequestBody List<Long> ids){
if (ids == null || ids.isEmpty()) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
boolean result = procurementPriceManagementService.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) {
procurementPriceManagementService.export(response);
--
Gitblit v1.9.3