From d709e8a7117704ac4717db5201e40964b90d4791 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 16:17:03 +0800
Subject: [PATCH] Merge dev_pro_河南鹤壁 into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
index d78a5e1..7fdc5ca 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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.InboundManagement;
import com.ruoyi.procurementrecord.service.InboundManagementService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -30,35 +32,38 @@
@GetMapping("/listPage")
@Operation(summary = "鍒拌揣绠＄悊-鏌ヨ")
- public R<?> listPage(Page page, InboundManagement inboundManagement) {
+ public AjaxResult listPage(Page page, InboundManagement inboundManagement) {
IPage<InboundManagement> result = inboundManagementService.listPage(page, inboundManagement);
- 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 InboundManagement inboundManagement) {
+ public AjaxResult add(@RequestBody InboundManagement inboundManagement) {
inboundManagement.setArrivalTime(new Date());
boolean result = inboundManagementService.save(inboundManagement);
- 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 InboundManagement inboundManagement) {
+ public AjaxResult update(@RequestBody InboundManagement inboundManagement) {
boolean result = inboundManagementService.updateById(inboundManagement);
- 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<?> del(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public AjaxResult del(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean result = inboundManagementService.removeByIds(ids);
- return result ? R.ok() : R.fail();
+ return result ? AjaxResult.success() : AjaxResult.error();
}
}
--
Gitblit v1.9.3